X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=omf-resctl.spec;h=f36725a60b3e4045992a3260685e4d74b95d177b;hb=14c76fd7be356fddfefae36ab11f98ac62be4a63;hp=555bfe1f82e5c890059b7a9d434bf10d42e9d1bf;hpb=b0505c54f17ab29f2587b52cf6701a0de8349f85;p=omf.git

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 555bfe1..f36725a 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -7,7 +7,7 @@
 %define taglevel 9
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu10-2
+%define resctl_actual_name omf-resctl-5.3-1ubuntu11-2
 
 Summary: OMF Resource Controller - for slivers
 Name: %{name}
@@ -23,7 +23,7 @@ Packager: PlanetLab <devel@planet-lab.org>
 Distribution: %{pldistro} %{plrelease}
 URL: %{SCMURL}
 
-# BuildArch: noarch
+BuildArch: noarch
 
 Requires: pciutils  
 Requires: ruby  
@@ -35,7 +35,7 @@ Requires: rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 Requires: omf-common  
 Requires: liblog4r
 Requires: libxmpp4r
-Requires: imagezip
+#Requires: imagezip
 
 %description 
 The OMF Resource Controller (RC) is the experiment-side of the
@@ -43,7 +43,7 @@ Experiment Eontroller (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-1ubuntu10-2
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -70,13 +70,13 @@ Group: System Environment/Base
 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
+#%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
 
 ####################
 
@@ -89,15 +89,15 @@ 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)
+#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
@@ -165,12 +165,12 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 /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
+#%files -n imagezip
+#%defattr(-,root,root)
+#/usr/bin/imagedump
+#/usr/bin/imageunzip
+#/usr/bin/imagezip
+#/usr/share/doc/imagezip
 
 ####################
 %changelog