X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=NodeUpdate.spec;h=f5b7aa003241c95a439943aea01b44d2f959f906;hb=76598e7190f128cb4af16076b0be7319abfe0455;hp=91201c9898bd90ae8f1909fa1b17f02b1e5f3fc6;hpb=de75baf5ed93e3a75c6b18b24580e8744fb55381;p=nodeupdate.git

diff --git a/NodeUpdate.spec b/NodeUpdate.spec
index 91201c9..f5b7aa0 100644
--- a/NodeUpdate.spec
+++ b/NodeUpdate.spec
@@ -1,11 +1,18 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name NodeUpdate
 %define version 0.5
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define taglevel 6
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 4.1
-URL: http://cvs.planet-lab.org/cvs/NodeUpdate
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Summary: PlanetLab service to periodically update node RPMS
 Name: %{name}
@@ -29,8 +36,9 @@ PlanetLab service to periodically update node RPMS
 
 
 %install
+echo "* Installing NodeUpdate node-side files"
 install -D -m 755 NodeUpdate.py $RPM_BUILD_ROOT/usr/bin/NodeUpdate.py
-install -D -m 644 NodeUpdate.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/NodeUpdate
+install -D -m 644 logrotate/NodeUpdate $RPM_BUILD_ROOT/etc/logrotate.d/NodeUpdate
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -40,21 +48,28 @@ install -D -m 644 NodeUpdate.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/NodeUpdat
 %attr(0755,root,root) /usr/bin/NodeUpdate.py*
 %attr(0644,root,root) /etc/logrotate.d/NodeUpdate
 
-%pre
-
 %post
 /usr/bin/NodeUpdate.py updatecron
 
 %preun
 if [ "$1" = 0 ]; then
-	/usr/bin/NodeUpdate.py removecron
+    /usr/bin/NodeUpdate.py removecron
 fi
 
+%changelog
+* Fri Jan 29 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - NodeUpdate-0.5-6
+- new module layout - no functional change
 
-%postun
+* Mon Sep 07 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - NodeUpdate-0.5-5
+- searches the extensions file /etc/planetlab/extensions rather than the former /etc/planetlab/extra-node-groups
 
+* Tue Apr 07 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - NodeUpdate-0.5-4
+- invokes 'yum clean all' before updates
+- as it is more reliable, although suboptimal
+
+* Tue Jul 08 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - NodeUpdate-0.5-3
+- more verbose : invoke yum with --verbose, and print timestamps
 
-%changelog
 * Fri Aug 10 2007 Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 - Rebuild RPM Database nightly to avoid corruption
 - Move working directory from /usr/local to /usr/bin