X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-lib.spec;h=564f5abaaf24a2da99afc31569719b3ec5d4905a;hb=f4e23a36bf09db433870ce196d73bbe66f8c749c;hp=a6d15e57456bc4135aa252263d653202102a9d97;hpb=4df085af669143c6605392fe92b081da265aca74;p=nodemanager.git

diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec
index a6d15e5..564f5ab 100644
--- a/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@ -2,10 +2,19 @@
 
 %define name nodemanager-lib
 %define version 5.2
-%define taglevel 9
+%define taglevel 12
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
+########## use initscripts or systemd unit files to start installed services
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 18
+%define make_options WITH_SYSTEMD=true
+%define initdir /usr/lib/systemd/system
+%else
+%define make_options WITH_INIT=true
+%define initdir %{_initrddir}
+%endif
+
 Summary: PlanetLab Node Manager Library
 Name: %{name}
 Version: %{version}
@@ -23,6 +32,11 @@ URL: %{SCMURL}
 # not possible because of forward_api_calls
 #BuildArch: noarch
 
+# make sure we can invoke systemctl in post install script
+%if "%{initdir}" != "%{_initrddir}"
+Requires: systemd
+%endif
+
 # Uses function decorators
 Requires: python >= 2.7
 # connecting PLC
@@ -45,15 +59,6 @@ local operations on slices.
 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
-%define initdir /usr/lib/systemd/system
-%else
-%define make_options WITH_INIT=true
-%define initdir %{_initrddir}
-%endif
-
 ##############################
 %prep
 %setup -q
@@ -132,9 +137,28 @@ rm -rf $RPM_BUILD_ROOT
 %{initdir}/
 %{_sysconfdir}/logrotate.d/nodemanager
 /var/lib/nodemanager/
-/bin/sshsh
+%config(noreplace) /etc/sysconfig/nodemanager
 
 %changelog
+* Fri Apr 04 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-12
+- this tag for the first time passes the full range of tests on fedora20
+- robustified slice teardown wrt vsys
+- Scott's fix for repairing veth devs
+- removed sshsh
+- tools.has_systemctl
+
+* Tue Mar 25 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-11
+- ship /etc/sysconfig/nodemanager
+- trash sshsh
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-10
+- comes with systemd native unit files on >= f18
+- user-provided initscript gets started through systemd in slivers >= f18
+- smarter to locate cgroups for various versions of libvirt
+- nicer log format - and log program termination
+- tweaks in codemux plugin
+- bug fixes in libvirt driver, esp. for finding out if domain is running
+
 * Wed Dec 11 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-9
 - fixes in hostmap, and in interfaces
 - new vsys_sysctl