[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-39-g61a07ea

X2Go dev team git-admin at x2go.org
Sun Dec 8 00:00:25 CET 2013


The branch, master has been updated
       via  61a07eae637f222543f4fdff0b38dddd5ff8ce14 (commit)
      from  119635850c8408e45d2d2dca2f3c5b013f8da1c6 (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 61a07eae637f222543f4fdff0b38dddd5ff8ce14
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 7 23:59:43 2013 +0100

    x2goclient.spec: try to fix faulty path to qmake-qt4

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

Summary of changes:
 x2goclient.spec |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/x2goclient.spec b/x2goclient.spec
index 1c4fe4e..b79951c 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -40,16 +40,10 @@ 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
+%if 0%{?rhel_version}
 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
-sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro
-sed -i -e 's/include.*qtbrowserplugin.pri)/LIBS += -lqtbrowserplugin/' x2goclient.pro
-rm -r qtbrowserplugin*
-%elif 0%{?rhel_version} >= 6
+%if 0%{?fedora_version} >= 18 || 0%{?rhel_version} >= 6
 # Use system qtbrowserplugin
 sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro
 sed -i -e '/^LIBS /s/$/ -ldl/' 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).




More information about the x2go-commits mailing list