[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-37-g3bbd2d0

[X2Go dev team]

The branch, build-main has been updated
       via  3bbd2d0095ad9bfacfb130ac76619b295a11e93a (commit)
      from  979151f3ba50f0ab1c8aaa0d5f7598063fefd4ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    5 +++--
 debian/changelog |   11 +++++++----
 x2goclient.spec  |    3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index b76e5ef..c1b3af9 100755
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ BINDIR=$(PREFIX)/bin
 SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
 MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
+QMAKE_BINARY=/usr/bin/qmake-qt4
 
 all: build
 
@@ -29,12 +30,12 @@ build: build_client build_plugin build_man
 
 build_client:
 	lrelease x2goclient.pro
-	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
+	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
 	cd $(CLIENT_DIR) && $(MAKE)
 
 build_plugin:
 	lrelease x2goclient.pro
-	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
+	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
 	cd $(PLUGIN_DIR) && $(MAKE)
 
 build_man:
diff --git a/debian/changelog b/debian/changelog
index d21eae0..11e76e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,13 +22,16 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
       via sessions file or cmdline parameter.
     - Syntax fix of x2goclient.desktop file.
     - Test for various file locations of the pulseaudio cookie file.
+    - Allow patching of qmake-qt4 executable path in Makefile.
   * Pull-in packaging changes from Debian.
   * debian/source/format:
     + Switch to format 1.0.
-  * Ship x2goclient.spec (RPM package definitions) in upstream project. (Thanks
-    to the Fedora package maintainers).
-  * Make package build on Fedora/EPEL versions that do not have the qtbrowserplugin
-    package.
+  * x2goclient.spec:
+    + Ship x2goclient.spec (RPM package definitions) in upstream project.
+      (Thanks to the Fedora package maintainers).
+    + Make package build on Fedora/EPEL versions that do not have the
+      qtbrowserplugin package.
+    + Replace qmake-qt4 path in Makefile.
 
   [ Ricardo Díaz Martín ]
   * New upstream versino (4.0.1.2):
diff --git a/x2goclient.spec b/x2goclient.spec
index c8c171e..1b3d99b 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -40,6 +40,9 @@ directories.
 # Fix up install issues
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
+%if 0%{?rhel_version} <= 6
+sed -i -e '@^QMAKE_BINARY=@s@/usr/bin/qmake-qt4@/usr/lib/qt4/bin/qmake@' Makefile
+%endif
 %if 0%{?fedora_version} >= 18
 # Use system qtbrowserplugin
 sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).