[X2Go-Commits] [x2goclient] 17/25: pyhoca-cli.spec: actually fix issue: macros are expanded even in commented lines and some of them were not properly escaped via double percent sign characters.

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 1acaf61909eea5cbe2c021b20619334a34325369
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Dec 24 07:40:26 2019 +0100

    pyhoca-cli.spec: actually fix issue: macros are expanded even in commented lines and some of them were not properly escaped via double percent sign characters.
---
 debian/changelog | 2 ++
 pyhoca-cli.spec  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6565592c..f088ef5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
       python-devel as a build requirement (only)... for some weird reason.
     + Revert backport *SuSE build fix: we probably don't need this, problem
       lies somewhere else.
+    + Actually fix issue: macros are expanded even in commented lines and some
+      of them were not properly escaped via double percent sign characters.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index e6686972..5725958b 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.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/x2goclient.git