[X2Go-Commits] [x2goclient] 02/02: x2goclient.spec: correctly quote PATH overrides.

git-admin at x2go.org git-admin at x2go.org
Wed May 19 03:00:16 CEST 2021


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 1b8fa77ad079a55183fed2c6b8983f6e7949ee6e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed May 19 02:58:21 2021 +0200

    x2goclient.spec: correctly quote PATH overrides.
---
 debian/changelog | 1 +
 x2goclient.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd1de4b..c17c48e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     - Makefile: invoke make as $(MAKE) to keep original invocation.
     - x2goclient.spec: fix missing %endif in Qt-4-BuildRequires section.
     - x2goclient.spec: use %{_qt5_bindir} macro analogous to the Qt 4 variant.
+    - x2goclient.spec: correctly quote PATH overrides.
   * debian/control:
     + Move to debian/control.in.
   * debian/control.in:
diff --git a/x2goclient.spec b/x2goclient.spec
index c15eb76..281e9c7 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -151,7 +151,7 @@ test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true
 %define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}' QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}'
 %if %{qt_version} == 4
 %if 0%{?_qt4_bindir:1}
-export PATH=%{_qt4_bindir}:$PATH
+export 'PATH=%{_qt4_bindir}:'"${PATH}"
 %endif
 %if 0%{?el5}
 %{make_call} QMAKE_BINARY='%{_libdir}/qt4/bin/qmake' LRELEASE_BINARY='%{_libdir}/qt4/bin/lrelease'
@@ -165,7 +165,7 @@ export PATH=%{_qt4_bindir}:$PATH
 %else
 %if %{qt_version} == 5
 %if 0%{?_qt5_bindir:1}
-export PATH=%{_qt5_bindir}:$PATH
+export 'PATH=%{_qt5_bindir}:'${PATH}"
 %endif
 %{make_call}
 %endif

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


More information about the x2go-commits mailing list