This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from f261e7e 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). new cb6411c x2goclient.spec: rework Qt5 dependencies. new 16bb4d7 Makefile: make controllable variables default-if-not-set to allow overriding via the environment. new c3bd880 Makefile: invoke make as $(MAKE) to keep original invocation. The 3 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 | 44 ++++++++++++++++++++++---------------------- debian/changelog | 6 ++++++ x2goclient.spec | 17 +++++++++-------- 3 files changed, 37 insertions(+), 30 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 16bb4d7bb421bdc1ba5952d0afd196b7d3b812d7 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 16 15:27:11 2021 +0200 Makefile: make controllable variables default-if-not-set to allow overriding via the environment. --- Makefile | 42 +++++++++++++++++++++--------------------- debian/changelog | 2 ++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 0e116f2..781622d 100755 --- a/Makefile +++ b/Makefile @@ -10,35 +10,35 @@ SHELL=/bin/bash # We'll change this to Qt 5 as soon as Qt-4-based platforms go EOL. QT_VERSION ?= 4 -INSTALL_DIR=install -d -o root -g root -m 755 -INSTALL_FILE=install -o root -g root -m 644 -INSTALL_SYMLINK=ln -s -f -INSTALL_PROGRAM=install -o root -g root -m 755 - -RM_FILE=rm -f -RM_DIR=rmdir -p --ignore-fail-on-non-empty - -DESTDIR= -PREFIX=/usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SHAREDIR=$(PREFIX)/share -MANDIR=$(SHAREDIR)/man +INSTALL_DIR ?= install -d -o root -g root -m 755 +INSTALL_FILE ?= install -o root -g root -m 644 +INSTALL_SYMLINK ?= ln -s -f +INSTALL_PROGRAM ?= install -o root -g root -m 755 + +RM_FILE ?= rm -f +RM_DIR ?= rmdir -p --ignore-fail-on-non-empty + +DESTDIR ?= +PREFIX ?= /usr/local +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SHAREDIR ?= $(PREFIX)/share +MANDIR ?= $(SHAREDIR)/man ifeq ($(QT_VERSION),4) - QMAKE_BINARY := qmake-qt4 - LRELEASE_BINARY := lrelease-qt4 + QMAKE_BINARY ?= qmake-qt4 + LRELEASE_BINARY ?= lrelease-qt4 else ifeq ($(QT_VERSION),5) - QMAKE_BINARY := qmake - LRELEASE_BINARY := lrelease + QMAKE_BINARY ?= qmake + LRELEASE_BINARY ?= lrelease else $(error Unsupported Qt version "$(QT_VERSION)" passed.) endif endif -QMAKE_OPTS= +QMAKE_OPTS ?= -LDFLAGS= -LIBS= +LDFLAGS ?= +LIBS ?= ##################################################################### diff --git a/debian/changelog b/debian/changelog index 0e89a0a..c8cf473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - x2goclient.spec: rework Qt5 dependencies. Use a common set of PkgConfig()-based dependencies for the Qt 5 libraries themselves and only make the linguist tools (lrelease) conditional. + - Makefile: make controllable variables default-if-not-set to allow + overriding 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit cb6411c8bb962a5d91ce9cdf87f5231c2782e502 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 16 11:54:38 2021 +0200 x2goclient.spec: rework Qt5 dependencies. Use a common set of PkgConfig()-based dependencies for the Qt 5 libraries themselves and only make the linguist tools (lrelease) conditional. --- debian/changelog | 3 +++ x2goclient.spec | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index fda6de9..0e89a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - 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). + - x2goclient.spec: rework Qt5 dependencies. Use a common set of + PkgConfig()-based dependencies for the Qt 5 libraries themselves and + only make the linguist tools (lrelease) conditional. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.spec b/x2goclient.spec index e140005..6c88867 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -34,19 +34,13 @@ buildrequires: openldap2-devel BuildRequires: openldap-devel %endif -%if 0%{?suse_version} %if %{qt_version} == 4 +%if 0%{?suse_version} BuildRequires: libqt4-devel %if 0%{?suse_version} >= 1310 BuildRequires: libqt4-linguist %endif %else -%if %{qt_version} == 5 -BuildRequires: libqt5-qtbase-devel -%endif -%endif -%else -%if %{qt_version} == 4 %if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel %else @@ -54,7 +48,14 @@ BuildRequires: qt-devel %endif %else %if %{qt_version} == 5 -BuildRequires: qt5-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +%if 0%{?suse_version} +BuildRequires: libqt5-linguist +%else +BuildRequires: qt5-linguist %endif %endif %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 c3bd880325c953bdc90fb96be95d3b44ec6ec63f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 16 15:30:31 2021 +0200 Makefile: invoke make as $(MAKE) to keep original invocation. --- Makefile | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 781622d..a6dc732 100755 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ clean_client: rm -fr $(CLIENT_DIR) clean_man: - make -f Makefile.man2html clean + $(MAKE) -f Makefile.man2html clean install: install_client install_man diff --git a/debian/changelog b/debian/changelog index c8cf473..249dd55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium only make the linguist tools (lrelease) conditional. - Makefile: make controllable variables default-if-not-set to allow overriding via the environment. + - Makefile: invoke make as $(MAKE) to keep original invocation. * 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