[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-48-gef0c348

[X2Go dev team]

The branch, master has been updated
       via  ef0c348d73b8870ece8642362986efb33d6e12d0 (commit)
      from  a5601012de1efa29290af893371083033a0c5ae3 (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 -----------------------------------------------------------------
commit ef0c348d73b8870ece8642362986efb33d6e12d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 8 14:56:59 2013 +0100

    Make qmake-qt4 and lrelease path in Makefile easily replacable (as RHEL-5 does not have those tools in $PATH). + For EPEL-5 builds: replace full path to qmake-qt4 and lrelease. For EPEL-5 builds: replace full path to qmake-qt4 and lrelease.

-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    5 +++--
 debian/changelog |    4 +++-
 x2goclient.spec  |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index c1b3af9..6b667e1 100755
--- a/Makefile
+++ b/Makefile
@@ -23,18 +23,19 @@ SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
 MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
 QMAKE_BINARY=/usr/bin/qmake-qt4
+LRELEASE_BINARY=/usr/bin/lrelease
 
 all: build
 
 build: build_client build_plugin build_man
 
 build_client:
-	lrelease x2goclient.pro
+	$(LRELEASE_BINARY) 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
+	$(LRELEASE_BINARY) 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)
 
diff --git a/debian/changelog b/debian/changelog
index b2ccb08..37f1345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - 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.
+    - Make qmake-qt4 and lrelease path in Makefile easily replacable (as
+      RHEL-5 does not have those tools in $PATH).
   * Pull-in packaging changes from Debian.
   * debian/source/format:
     + Switch to format 1.0.
@@ -32,7 +34,7 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     + Clear (Fedora package) changelog.
     + Make package build on Fedora/EPEL versions that do not have the
       qtbrowserplugin package.
-    + Replace qmake-qt4 path in Makefile.
+    + For EPEL-5 builds: replace full path to qmake-qt4 and lrelease.
 
   [ Ricardo Díaz Martín ]
   * New upstream versino (4.0.1.2):
diff --git a/x2goclient.spec b/x2goclient.spec
index 9383626..8347aec 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -49,6 +49,7 @@ sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
 %if 0%{?el5}
 sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile
+sed -i -e '/^LRELEASE_BINARY=/s@/usr/bin/lrelease@%{_libdir}/qt4/bin/lrelease@' Makefile
 %endif
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
 # Use system qtbrowserplugin


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).