X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=b3b9886d8373df90294d1d5105625a196bb1f95f;hb=82d099c7771dd3517bb300552e5b182f49bb27bc;hp=4e2d60814533e221d708c8aae4430fd0124bfe44;hpb=f0e6361c65858ae53c1151c1bed20357d725201e;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 4e2d608..b3b9886 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,6 +1,6 @@
 %define name myplc
-%define version 5.0
-%define taglevel 17
+%define version 5.1
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -25,6 +25,7 @@ Summary: PlanetLab Central (PLC) Portable Installation
 Group: Applications/Systems
 
 # as much as possible, requires should go in the subpackages specfile
+Requires: redhat-lsb
 Requires: bzip2
 Requires: tar 
 Requires: less
@@ -65,7 +66,7 @@ Requires: www-register-wizard
 Requires: nodeconfig
 Requires: nodeyum
 Requires: PLCAPI
-Requires: bootstrapfs-%{nodefamily}
+Requires: nodeimage-%{nodefamily}
 Requires: myplc-docs
 Requires: myplc-release
 Requires: myplc-config
@@ -113,6 +114,7 @@ chmod 755 ${RPM_BUILD_ROOT}/usr/bin/*
 # Install initscript 
 echo "* Installing plc initscript"
 install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc
+install -D -m 644 plc.service ${RPM_BUILD_ROOT}/lib/systemd/system/plc.service
 
 # Install initscripts
 echo "* Installing plc.d initscripts"
@@ -231,7 +233,6 @@ fi
 /usr/bin/db-config
 /usr/bin/dns-config
 /usr/bin/refresh-peer.py*
-/usr/bin/partial-repo.sh
 /usr/bin/mtail.py*
 /usr/bin/plc-map.py*
 /usr/bin/plc-kml.py*
@@ -240,6 +241,7 @@ fi
 /usr/bin/plc-orphan-accounts.py*
 /usr/bin/spot-aliens.py*
 /usr/bin/spot-dup-accounts.sh
+/lib/systemd/system/plc.service
 
 %files config
 %defattr(-,root,root,-)
@@ -248,6 +250,24 @@ fi
 
 
 %changelog
+* Mon Apr 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.1-1
+- use nodeimage package instead of deprecated bootstrapfs
+- has systemd-friendly startup script
+- plc_reload moved to functions/ - no more service plc reload
+- no svn keywords anymore
+
+* Mon Sep 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-19
+- new maintenance/monitoring script spot-aliens to look for glitches in refreshpeer+sfa
+
+* Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-18
+- new settings for myslice (comon&tophat) and monitor (db)
+- removed mentions of chroot in description
+- can redo myplc-docs on broken f12-latex
+- set short_open_tag in php.ini
+- fixes in gen-sites-xml (is that still used ?)
+- partial-repo.sh has moved to 'build' where it more belongs
+- tweaks in convenience tool 'mtail'
+
 * Tue Mar 22 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-17
 - fixed changelog, no change from 5.0-16