[X2Go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.1.0-12-g1efeb2f

[X2Go dev team]

The branch, master has been updated
       via  1efeb2f676cfeb9d762ee62a04f4b04ddac4a136 (commit)
      from  56bb51d7ca52e6cbe4ffadad05d9b4f7f0c7475c (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 1efeb2f676cfeb9d762ee62a04f4b04ddac4a136
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 10 19:30:19 2013 +0100

    x2godesktopsharing.spec: compat adaptations for EPEL-5

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

Summary of changes:
 x2godesktopsharing.spec |   11 +++++++++++
 1 file changed, 11 insertions(+)

The diff of changes is:
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 6858f59..ca14cb6 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -13,6 +13,11 @@ BuildRequires:  qt4-devel
 Requires:       hicolor-icon-theme
 Requires:       x2goserver
 
+%if 0%{?el5}
+# For compatibility with EPEL5
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%endif
+
 %description
 X2Go is a server based computing environment with
     - session resuming
@@ -32,7 +37,13 @@ a local X11 session.
 
 
 %build
+
+
+%if 0%{?el5}
+%{_libdir}/qt4/bin/qmake
+%else
 qmake-qt4
+%endif
 make %{?_smp_mflags}
 
 


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).