[X2Go-Commits] [x2goplasmabindings] 01/01: Find a common cmake approach for all RPM distros.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goplasmabindings.

commit 0e5722e4084545dfa0a4294b64bfeec4d99bb578
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 15 08:40:19 2014 +0200

    Find a common cmake approach for all RPM distros.
---
 debian/changelog        |    1 +
 x2goplasmabindings.spec |   10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 852863a..a713806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goplasmabindings (3.0.2.1-0x2go1) UNRELEASED; urgency=low
   * x2goplasmabindings.spec:
     + Adapt to building on openSUSE/SLES.
     + Different RPM distros have different or no %cmake macro.
+    + Find a common cmake approach for all RPM distros.
 
   [ Martti Pitkänen ]
   * New upstream version (3.0.2.1):
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index 9fde7c1..a191da5 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -61,26 +61,18 @@ X2Go session.
 
 
 %build
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1310
-%cmake
-%else
-mkdir build
 cd build
 cmake .. \
         -DCMAKE_INSTALL_PREFIX="%_prefix" \
         -DCMAKE_INSTALL_LIBEXEC="%_libexecdir" \
         -DCMAKE_C_FLAGS:STRING="%optflags" \
         -DCMAKE_CXX_FLAGS:STRING="%optflags"
-%endif
-%else
-%cmake .
-%endif
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git