This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from b4cfff0 x2goclient.spec: add version switching support. Use Qt 5 for FC31+, RHEL 8 and *SuSE 15.3+. new 9a52901 x2goclient.spec: don't try to prepend %{_qt4_bindir} if the macro is not defined. new fc2db75 Makefile: allow passing down variables that are safe to pass via the environment. 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: Makefile | 6 +++--- debian/changelog | 4 ++++ x2goclient.spec | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) -- 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 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit fc2db75ab86889cdde6448c4e6e5a25c431d212d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat May 15 23:47:21 2021 +0200 Makefile: allow passing down variables that are safe to pass via the environment. --- Makefile | 6 +++--- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bac0109..0e116f2 100755 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ LIBS= # implementation to make implementation. # GNU make way. -MAKEOVERRIDES= +MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS # FreeBSD and NetBSD way. -.MAKEOVERRIDES= +.MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS # OpenBSD way. -.MAKEFLAGS= +.MAKEFLAGS = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS all: build diff --git a/debian/changelog b/debian/changelog index 53d6138..12b21b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium 8 and *SuSE 15.3+. - x2goclient.spec: don't try to prepend %{_qt4_bindir} if the macro is not defined. + - Makefile: allow passing down variables that are safe to pass via the + environment. * debian/control: + Move to debian/control.in. * debian/control.in: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org