[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-50-g088dd58

[X2Go dev team]

The branch, master has been updated
       via  088dd58c8c3fc46a2b4bda8959138b512ffb724a (commit)
      from  4bf8e6eb54fae222d753c74dea5f8e928d5e8fed (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 088dd58c8c3fc46a2b4bda8959138b512ffb724a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 8 16:03:42 2013 +0100

    fix lrelease/qmake binary replacement with EPEL-5 builds

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

Summary of changes:
 Makefile        |    4 ++--
 x2goclient.spec |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 5318f71..b2da40d 100755
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ BINDIR=$(PREFIX)/bin
 SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
 MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
-QMAKE_BINARY=/usr/bin/qmake-qt4
-LRELEASE_BINARY=/usr/bin/lrelease
+QMAKE_BINARY=qmake-qt4
+LRELEASE_BINARY=lrelease
 
 all: build
 
diff --git a/x2goclient.spec b/x2goclient.spec
index 8347aec..1c07360 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -48,8 +48,8 @@ directories.
 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
+sed -i -e '/^QMAKE_BINARY=/s at qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile
+sed -i -e '/^LRELEASE_BINARY=/s at 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).