[X2Go-Commits] [x2goclient] 02/02: x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead of using it as a string in the condition (which then leads to parsing error).

[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 x2goclient.

commit f261e7e0441bcb71389371168db250d58a24b457
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 16 01:28:52 2021 +0200

    x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead of using it as a string in the condition (which then leads to parsing error).
---
 debian/changelog | 3 +++
 x2goclient.spec  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eb029cc..fda6de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
       environment.
     - x2goclient.spec: fix condition with maybe-undefined macro.
     - x2goclient.spec: typo fix in vendor macro.
+    - x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead
+      of using it as a string in the condition (which then leads to parsing
+      error).
   * debian/control:
     + Move to debian/control.in.
   * debian/control.in:
diff --git a/x2goclient.spec b/x2goclient.spec
index 150fa85..e140005 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -148,7 +148,7 @@ test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true
 %build
 %define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}' QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}'
 %if %{qt_version} == 4
-%if 0%{?_qt4_bindir}
+%if 0%{?_qt4_bindir:1}
 export PATH=%{_qt4_bindir}:$PATH
 %endif
 %if 0%{?el5}

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