git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes
[nodemanager.git]
/
nodemanager-lib.spec
diff --git
a/nodemanager-lib.spec
b/nodemanager-lib.spec
index
92a8f58
..
dfa2f70
100644
(file)
--- a/
nodemanager-lib.spec
+++ b/
nodemanager-lib.spec
@@
-5,7
+5,6
@@
%define taglevel 9
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define taglevel 9
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
Summary: PlanetLab Node Manager Library
Name: %{name}
Summary: PlanetLab Node Manager Library
Name: %{name}
@@
-46,18
+45,24
@@
local operations on slices.
nodemanager-lib only provides a skeleton and needs as a companion
either nodemanager-vs or nodemanager-lxc
nodemanager-lib only provides a skeleton and needs as a companion
either nodemanager-vs or nodemanager-lxc
+# use initscripts or systemd unit files to start installed services
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 18
+%define make_options WITH_SYSTEMD=true
+%else
+%define make_options WITH_INIT=true
+%endif
+
%prep
%setup -q
%build
# make manages the C and Python stuff
%prep
%setup -q
%build
# make manages the C and Python stuff
-%{__make} %{?_smp_mflags}
lib
+%{__make} %{?_smp_mflags}
%{make_options} lib
%install
# make manages the C and Python stuff
rm -rf $RPM_BUILD_ROOT
%install
# make manages the C and Python stuff
rm -rf $RPM_BUILD_ROOT
-%{__make} %{?_smp_mflags} install-lib DESTDIR="$RPM_BUILD_ROOT"
-PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+%{__make} %{?_smp_mflags} %{make_options} install-lib DESTDIR="$RPM_BUILD_ROOT"
# install the sliver initscript (that triggers the slice initscript if any)
mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
# install the sliver initscript (that triggers the slice initscript if any)
mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/