This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 9a52901fccabd53897107f2a8d5f979cdda58008 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat May 15 23:30:01 2021 +0200 x2goclient.spec: don't try to prepend %{_qt4_bindir} if the macro is not defined. --- debian/changelog | 2 ++ x2goclient.spec | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6c0cbf9..53d6138 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium might be overridden via environment variables or the make call. - x2goclient.spec: add version switching support. Use Qt 5 for FC31+, RHEL 8 and *SuSE 15.3+. + - x2goclient.spec: don't try to prepend %{_qt4_bindir} if the macro is not + defined. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.spec b/x2goclient.spec index f9eedd9..20fc476 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -148,7 +148,9 @@ 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} export PATH=%{_qt4_bindir}:$PATH +%endif %if 0%{?el5} %{make_call} QMAKE_BINARY='%{_libdir}/qt4/bin/qmake' LRELEASE_BINARY='%{_libdir}/qt4/bin/lrelease' %else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git