From: thierry <thierry@8c455092-636d-4788-adf5-e71def0336e8>
Date: Thu, 11 Mar 2010 17:25:54 +0000 (+0000)
Subject: cleaner package - remove various symlinks
X-Git-Tag: omf-5.3-1~1
X-Git-Url: http://git.onelab.eu/?p=omf.git;a=commitdiff_plain;h=07bccbea1cb7ff41cc2f76435f1fce5b0e8498a9;hp=19b45027fd5d1a1b2a8e149d93de693942cfb66c

cleaner package - remove various symlinks
---

diff --git a/omf-resctl.spec b/omf-resctl.spec
index f0bf4b8..5395d64 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -103,17 +103,20 @@ make libxmpp4r
 make imagezip 
 (cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
 
+# 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
 
-install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
-ln -s omf-resctl-%{version} $RPM_BUILD_ROOT/etc/omf-resctl 
-
 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
 
@@ -130,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add omf-resctl-%{version}
 service omf-resctl-%{version} restart
 
+%preun
+service omf-resctl-%{version} stop
+/sbin/chkconfig --del omf-resctl-%{version}
+
 ####################
 %files -n omf-common
 %defattr(-,root,root)