[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-44-gd0a173e

[X2Go dev team]

The branch, master has been updated
       via  d0a173ec6d6ce1faa72ab23f9417926b6e244eb7 (commit)
      from  eb289f10dbf0f6da0ace35c029ef2a4521d0c9df (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 d0a173ec6d6ce1faa72ab23f9417926b6e244eb7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 8 12:01:03 2013 +0100

    x2goclient.spec: (hopefully) fix distro version checks

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

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

The diff of changes is:
diff --git a/x2goclient.spec b/x2goclient.spec
index bd3fcf0..b996465 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -19,15 +19,17 @@ BuildRequires:  man
 %endif
 BuildRequires:  openldap-devel
 BuildRequires:  qt-devel
-%if 0%{?fedora_version} >= 18 || 0%{?rhel_version} >= 6
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
 BuildRequires:  qtbrowserplugin-static
 %endif
 Requires:       hicolor-icon-theme
 Requires:       mozilla-filesystem
 Requires:       nxproxy
 
+%if 0%{?el5}
 # For compatibility with EPEL5
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%endif
 
 %description
 This client will be able to connect to X2Go server(s) and start, stop, resume 
@@ -41,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%{?rhel_version}
+%if 0%{?el5} || 0%{?el6}
 sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@/usr/lib/qt4/bin/qmake@' Makefile
 %endif
-%if 0%{?fedora_version} >= 18 || 0%{?rhel_version} >= 6
+%if 0%{?fedora} >= 18 || 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).