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

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 349c6c0..06e8f51 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -9,7 +9,7 @@
 
 %define name omf-resctl
 %define version 5.3
-%define taglevel 1
+%define taglevel 3
 
 %define plc_name %{name}-%{version}-%{taglevel}
 %define actual_name omf-resctl-5.3-1ubuntu2-2
@@ -103,14 +103,20 @@ make libxmpp4r
 make imagezip 
 (cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
 
-# cleanup svn sequels
+# remove any default config if any
+rm -f unwrap/etc/omf-resctl-%{version}/omf-resctl.yaml
+
+# cleanup any svn sequels
 find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
 
+
 %install
 rm -fr $RPM_BUILD_ROOT
 
 rsync -a unwrap/ $RPM_BUILD_ROOT
 
+install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -124,10 +130,14 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %post
-mkdir /etc/omf-resctl-5.3/
-# xxx tweak config in /etc/omf-resctl-5.3/
-/sbin/chkconfig --add omf-resctl-5.3
-service omf-resctl-5.3 restart
+/sbin/chkconfig --add omf-resctl-%{version}
+/sbin/chkconfig omf-resctl-%{version} on
+service omf-resctl-%{version} restart
+
+%preun
+service omf-resctl-%{version} stop
+/sbin/chkconfig omf-resctl-%{version} off
+/sbin/chkconfig --del omf-resctl-%{version}
 
 ####################
 %files -n omf-common
@@ -163,3 +173,9 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 
 ####################
 %changelog
+* 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
+
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-2
+- package the exp. controller as well for user convenience
+