[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-46-g889404d
X2Go dev team
git-admin at x2go.org
Sun Dec 8 12:29:51 CET 2013
The branch, master has been updated
via 889404d9b76b92e374e6ae13078f45fed6fa38ab (commit)
from ce706b56c35eed88ae096b81aaaaa359d540ed1b (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 889404d9b76b92e374e6ae13078f45fed6fa38ab
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Dec 8 12:29:06 2013 +0100
package for Fedora 18 has to be built against shipped qtbrowserplugin, epel6 has /usr/bin/qmake-qt4
-----------------------------------------------------------------------
Summary of changes:
x2goclient.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2goclient.spec b/x2goclient.spec
index 0b75682..ffd9519 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -19,7 +19,7 @@ BuildRequires: man
%endif
BuildRequires: openldap-devel
BuildRequires: qt-devel
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
BuildRequires: qtbrowserplugin-static
%endif
Requires: hicolor-icon-theme
@@ -43,10 +43,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%{?el5} || 0%{?el6}
+%if 0%{?el5}
sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@/usr/lib/qt4/bin/qmake@' Makefile
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 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