X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-resctl.spec;h=555bfe1f82e5c890059b7a9d434bf10d42e9d1bf;hb=b0505c54f17ab29f2587b52cf6701a0de8349f85;hp=06e8f510754e1afce08a6e4e5ab798aca48ba260;hpb=54849bf2d8bd77962402edae072294abfee1444b;p=omf.git

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 06e8f51..555bfe1 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -1,18 +1,13 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # Thierry Parmentelat - INRIA
 # Copyright (C) 2010 INRIA
 # License is GPL.
 
 %define name omf-resctl
 %define version 5.3
-%define taglevel 3
+%define taglevel 9
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu2-2
+%define actual_name omf-resctl-5.3-1ubuntu10-2
 
 Summary: OMF Resource Controller - for slivers
 Name: %{name}
@@ -26,7 +21,8 @@ BuildRoot: %{_tmppath}/%{plc_name}-buildroot
 Vendor: NICTA
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: %{pldistro} %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
+
 # BuildArch: noarch
 
 Requires: pciutils  
@@ -47,7 +43,7 @@ Experiment Eontroller (EC) that lets experimenter control their
 resources. It relies on an XMPP server for exchanging with its EC.
 
 ####################
-%define common_actual_name omf-common-5.3-1ubuntu3-2
+%define common_actual_name omf-common-5.3-1ubuntu9-2
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -130,14 +126,19 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %post
-/sbin/chkconfig --add omf-resctl-%{version}
-/sbin/chkconfig omf-resctl-%{version} on
-service omf-resctl-%{version} restart
+if [ -x /sbin/chkconfig ] ; then
+    /sbin/chkconfig --add omf-resctl-%{version}
+    /sbin/chkconfig omf-resctl-%{version} on
+    service omf-resctl-%{version} restart
+fi
 
 %preun
-service omf-resctl-%{version} stop
-/sbin/chkconfig omf-resctl-%{version} off
-/sbin/chkconfig --del omf-resctl-%{version}
+# 0 = erase, 1 = upgrade
+if [ $1 -eq 0 ] ; then
+    service omf-resctl-%{version} stop
+    /sbin/chkconfig omf-resctl-%{version} off
+    /sbin/chkconfig --del omf-resctl-%{version}
+fi
 
 ####################
 %files -n omf-common
@@ -173,6 +174,24 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 
 ####################
 %changelog
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-9
+- no semantic change - just fixed specfile for git URL
+
+* Mon Aug 30 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-8
+- new packages from NICTA
+
+* Tue Jul 13 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-7
+- fix omf-expctl build
+
+* Thu Jul 08 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-6
+- updated omf packages
+
+* Tue Jun 22 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-5
+- cleaned up specfile for smoother upgrades
+
+* Tue May 25 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-4
+- fix stupid typo in tag 5.3-3
+
 * Tue May 25 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-3
 - fetch from the tagged omf-5.3-federation-v1.1 - and turn SHA1SUM checking back on again