[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-47-ga560101

[X2Go dev team]

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

    x2goclient.spec: more fixes for EPEL-5

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

Summary of changes:
 x2goclient.spec |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2goclient.spec b/x2goclient.spec
index ffd9519..9383626 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -18,7 +18,11 @@ BuildRequires:  man2html-core
 BuildRequires:  man
 %endif
 BuildRequires:  openldap-devel
+%if 0%{?el5}
+BuildRequires:  qt4-devel
+%else
 BuildRequires:  qt-devel
+%endif
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
 BuildRequires:  qtbrowserplugin-static
 %endif
@@ -44,7 +48,7 @@ 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@/usr/lib/qt4/bin/qmake@' Makefile
+sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@%{_libdir}/qt4/bin/qmake@' 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).