cleaner package - remove various symlinks

diff --git a/omf-resctl.spec b/omf-resctl.spec
index f0bf4b8..5395d64 100644 (file)
--- 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)
 
 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
 
 # cleanup any svn sequels
 find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
 

+

 %install
 rm -fr $RPM_BUILD_ROOT
 
 %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
 
 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
 
 %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
 
 /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)
 ####################
 %files -n omf-common
 %defattr(-,root,root)