[X2Go-Commits] [x2goplasmabindings] 01/01: Different RPM distros have different or no %cmake macro.
git-admin at x2go.org
git-admin at x2go.org
Tue Oct 14 20:35:00 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goplasmabindings.
commit 3195d62589c0da1110f18f2367318608947c3a8a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Oct 14 20:34:55 2014 +0200
Different RPM distros have different or no %cmake macro.
---
debian/changelog | 1 +
debian/rules | 2 +-
x2goplasmabindings.spec | 15 ++++++++++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b6c4961..87e2b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2goplasmabindings (3.0.2.1-0x2go1) UNRELEASED; urgency=low
+ Update file. Make it DEP-5 compliant.
* x2goplasmabindings.spec:
+ Adapt to building on openSUSE/SLES.
+ + Different RPM distros have different or no %cmake macro.
[ Martti Pitkänen ]
* New upstream version (3.0.2.1):
diff --git a/debian/rules b/debian/rules
index 6f03593..0d3f272 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,4 +15,4 @@ export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
%:
- dh $@
+ dh $@
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index e069937..4b05836 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -57,7 +57,21 @@ X2Go session.
%build
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 13.1
+%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"
+%fi
+%else
%cmake .
+%fi
make %{?_smp_mflags}
@@ -90,4 +104,3 @@ fi
%{_datadir}/
%changelog
-
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
More information about the x2go-commits
mailing list