[X2Go-Commits] [pyhoca-gui] 02/02: pyhoca-gui.spec: backport build fix from pyhoca-cli: correctly escape bcond_with* macros in comment lines.

[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 pyhoca-gui.

commit d27a45427373336b6b790b1150ba8ed6dd207925
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Dec 24 07:41:16 2019 +0100

    pyhoca-gui.spec: backport build fix from pyhoca-cli: correctly escape bcond_with* macros in comment lines.
---
 debian/changelog | 2 ++
 pyhoca-gui.spec  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47aa7d9..a2b09a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium
       requirement even for Python-3-builds.
     + Revert backport *SuSE build fix: we probably don't need this, problem
       lies somewhere else.
+    + Backport build fix from pyhoca-cli: correctly escape bcond_with* macros
+      in comment lines.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 11 Dec 2019 12:47:21 +0100
 
diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec
index 27cfb83..f9bf5d9 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -21,11 +21,11 @@
 # Conditional builds are a bit weird.
 # You CAN either enable or disable a feature via %%bcond_with{,out}, BUT you
 # can NOT override this value later on, it seems.
-# Case in point: I tried to use %bcond_without python2 for all older Fedora
-# versions, %bcond_with python3 for all Fedora versions starting with 26.
+# Case in point: I tried to use %%bcond_without python2 for all older Fedora
+# versions, %%bcond_with python3 for all Fedora versions starting with 26.
 # However, as pyhoca-{gui,cli} are just applications, we want to build against
 # one specific python version only, so I later tried to override the Python-2-
-# build via %bcond_with python2, essentially disabling it and preferring the
+# build via %%bcond_with python2, essentially disabling it and preferring the
 # Python-3-based version.
 # This didn't work, since %{?with_python2} was kept enabled.
 # Hence, we'll only enable/disable a feature once now, based upon the global

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