This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 164d666 x2goclient.spec: fix missing %endif in Qt-4-BuildRequires section. new aa6c094 x2goclient.spec: use %{_qt5_bindir} macro analogous to the Qt 4 variant. new 1b8fa77 x2goclient.spec: correctly quote PATH overrides. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goclient.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit aa6c094e674bd8fe9776b58d78816615053642a9 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 19 02:56:29 2021 +0200 x2goclient.spec: use %{_qt5_bindir} macro analogous to the Qt 4 variant. --- debian/changelog | 1 + x2goclient.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6547b7d..bd1de4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium overriding via the environment. - 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. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.spec b/x2goclient.spec index 950efc3..c15eb76 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -164,6 +164,9 @@ export PATH=%{_qt4_bindir}:$PATH %endif %else %if %{qt_version} == 5 +%if 0%{?_qt5_bindir:1} +export PATH=%{_qt5_bindir}:$PATH +%endif %{make_call} %endif %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org