[X2Go-Commits] [x2goplasmabindings] 05/07: x2goplasmabindings.spec: pass -DUSE_PLASMA5=OFF if we build for KDE 4 and add a guard comment to fix potential problems in the future.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goplasmabindings.

commit 9e9a4cfb1bb5d7c8af0b6e131293c6506481227a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue May 2 22:34:50 2023 +0200

    x2goplasmabindings.spec: pass -DUSE_PLASMA5=OFF if we build for KDE 4 and add a guard comment to fix potential problems in the future.
---
 debian/changelog        | 2 ++
 x2goplasmabindings.spec | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7564386..0203bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
     - x2goplasmabindings.spec: use cmake()-based BR where appropriate, add
       KF5I18n BR.
     - x2goplasmabindings.spec: fix short description.
+    - x2goplasmabindings.spec: pass -DUSE_PLASMA5=OFF if we build for KDE 4
+      and add a guard comment to fix potential problems in the future.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 22 Nov 2018 00:21:33 +0100
 
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index 513df5b..8f93b3f 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -104,8 +104,12 @@ cmake .. \
         -DCMAKE_C_FLAGS:STRING="%optflags" \
         -DCMAKE_CXX_FLAGS:STRING="%optflags" \
 %if 0%{?plasma5}
-        -DUSE_PLASMA5="ON"
+        '-DUSE_PLASMA5=ON'
+%else
+        '-DUSE_PLASMA5=OFF'
 %endif
+# This comment also serves as a guard in case the else branch is incorrectly
+# removed without noticing the last escaped newline.
 make %{?_smp_mflags}
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git