Setting tag omf-5.3-11

[omf.git] / omf-resctl.spec

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 29b8564..8598705 100644 (file)
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -4,10 +4,10 @@
 
 %define name omf-resctl
 %define version 5.3
-%define taglevel 9
+%define taglevel 11
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu10-2
+%define resctl_actual_name omf-resctl-5.3-5.3.1-1
 
 Summary: OMF Resource Controller - for slivers
 Name: %{name}
@@ -19,7 +19,7 @@ Source0: %{plc_name}.tar.bz2
 BuildRoot: %{_tmppath}/%{plc_name}-buildroot
 
 Vendor: NICTA
-Packager: PlanetLab <devel@planet-lab.org>
+Packager: OneLab <devel@planet-lab.org>
 Distribution: %{pldistro} %{plrelease}
 URL: %{SCMURL}
 
@@ -35,15 +35,14 @@ 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
-Experiment Eontroller (EC) that lets experimenter control their
+Experiment Controller (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-1ubuntu9-2
+%define common_actual_name omf-common-5.3-5.3.1-1
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -69,15 +68,6 @@ 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
@@ -89,21 +79,20 @@ rm -rf $RPM_BUILD_ROOT
 mkdir unwrap
 
 make omf-resctl 
-(cd unwrap; rpm2cpio ../%{actual_name}.noarch.rpm | cpio -diu)
+(cd unwrap; rpm2cpio ../%{resctl_actual_name}.noarch.rpm | cpio -diu)
 make omf-common
 (cd unwrap ; rpm2cpio ../%{common_actual_name}.noarch.rpm | cpio -diu)
 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 any svn sequels
 find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
+find unwrap -type d -name .git -print0 | xargs -0 rm -rf
 
 
 %install
@@ -164,16 +153,14 @@ 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
+* Mon Aug 29 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-11
+- updated with latest from NICTA
+
+* Tue Feb 01 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-10
+- move to more recent releases of omf-resctl & related stuff
+
 * Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-9
 - no semantic change - just fixed specfile for git URL