X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-resctl.spec;h=d05a8c90a98d1981e0c45531be5346034701ba60;hb=b43e5b8a6da765ea993f24dcd601f0ce826309ea;hp=c92e586e5c0699ce2bcdadb4cfed2515a2267d45;hpb=b4f292f95db365643b79436d75c536ac73cd1429;p=omf.git

diff --git a/omf-resctl.spec b/omf-resctl.spec
index c92e586..d05a8c9 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -3,13 +3,13 @@
 #
 %define url $URL$
 
-# Marc E. Fiuczynski <mef@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
+# Thierry Parmentelat - INRIA
+# Copyright (C) 2010 INRIA
 # License is GPL.
 
 %define name omf-resctl
 %define version 5.3
-%define taglevel 1
+%define taglevel 2
 
 %define plc_name %{name}-%{version}-%{taglevel}
 %define actual_name omf-resctl-5.3-1ubuntu2-2
@@ -27,9 +27,8 @@ Vendor: NICTA
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: %{pldistro} %{plrelease}
 URL: %(echo %{url} | cut -d ' ' -f 2)
-BuildArch: noarch
+# BuildArch: noarch
 
-Requires: imagezip
 Requires: pciutils  
 Requires: ruby  
 Requires: wget  
@@ -40,6 +39,7 @@ Requires: rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 Requires: omf-common  
 Requires: liblog4r
 Requires: libxmpp4r
+Requires: imagezip
 
 %description 
 The OMF Resource Controller (RC) is the experiment-side of the
@@ -73,6 +73,15 @@ Group: System Environment/Base
 %description -n libxmpp4r
 An XMPP/Jabber library for Ruby, needed by OMF software
 
+####################
+%define imagezip_actual_name imagezip-1.0.0-3
+
+%package -n imagezip
+Summary:  filesystem image compression tool from EMULAB
+Group: System Environment/Base
+%description -n imagezip
+filesystem image compression tool from EMULAB
+
 ####################
 
 %prep
@@ -91,15 +100,23 @@ make liblog4r
 (cd unwrap; rpm2cpio ../%{liblog4r_actual_name}.noarch.rpm | cpio -diu)
 make libxmpp4r 
 (cd unwrap; rpm2cpio ../%{libxmpp4r_actual_name}.noarch.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 svn sequels
+# 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
 
@@ -113,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
@@ -142,5 +163,16 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 /usr/lib/ruby/1.8/xmpp4r
 /usr/share/doc/libxmpp4r-ruby1.8
 
+####################
+%files -n imagezip
+%defattr(-,root,root)
+/usr/bin/imagedump
+/usr/bin/imageunzip
+/usr/bin/imagezip
+/usr/share/doc/imagezip
+
 ####################
 %changelog
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-2
+- package the exp. controller as well for user convenience
+