[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-36-g979151f

X2Go dev team git-admin at x2go.org
Fri Dec 6 13:23:48 CET 2013


The branch, master has been updated
       via  979151f3ba50f0ab1c8aaa0d5f7598063fefd4ed (commit)
      from  93d5e22355bbc0b388213bfaf2454da53a0e3222 (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 979151f3ba50f0ab1c8aaa0d5f7598063fefd4ed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 6 13:23:07 2013 +0100

    Make package build on Fedora/EPEL versions that do not have the qtbrowserplugin package.

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

Summary of changes:
 debian/changelog |    2 ++
 x2goclient.spec  |   13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index afc6267..d21eae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     + Switch to format 1.0.
   * Ship x2goclient.spec (RPM package definitions) in upstream project. (Thanks
     to the Fedora package maintainers).
+  * Make package build on Fedora/EPEL versions that do not have the qtbrowserplugin
+    package.
 
   [ Ricardo Díaz Martín ]
   * New upstream versino (4.0.1.2):
diff --git a/x2goclient.spec b/x2goclient.spec
index 43f84a4..c8c171e 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -19,7 +19,11 @@ BuildRequires:  man
 %endif
 BuildRequires:  openldap-devel
 BuildRequires:  qt-devel
+%if 0%{?fedora_version} >= 18
 BuildRequires:  qtbrowserplugin-static
+%elif 0%{?rhel_version} >= 6
+BuildRequires:  qtbrowserplugin-static
+%endif
 Requires:       hicolor-icon-theme
 Requires:       mozilla-filesystem
 Requires:       nxproxy
@@ -36,12 +40,19 @@ directories.
 # Fix up install issues
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
+%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
+# 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*
+%endif
 
 %build
 export PATH=%{_qt4_bindir}:$PATH


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