X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-expctl.spec;h=1c5dce223829dc2d349373781a40190378aa1052;hb=ff8eff232d5b451e3182c37c141b0fd2fcfeaff0;hp=44bd6b281e3d5d790e1cf45a2286b08763ec3b00;hpb=b0505c54f17ab29f2587b52cf6701a0de8349f85;p=omf.git

diff --git a/omf-expctl.spec b/omf-expctl.spec
index 44bd6b2..1c5dce2 100644
--- a/omf-expctl.spec
+++ b/omf-expctl.spec
@@ -7,7 +7,7 @@
 %define taglevel 9
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu10-2
+%define expctl_actual_name omf-resctl-5.3-1ubuntu11-2
 
 Summary: OMF Experiment Controller - for end-users
 Name: %{name}
@@ -19,11 +19,11 @@ 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}
 
-# 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 Experiment Controller (EC) is the front end for
@@ -52,10 +52,11 @@ rm -rf $RPM_BUILD_ROOT
 mkdir unwrap
 
 make omf-resctl 
-(cd unwrap; rpm2cpio ../%{actual_name}.noarch.rpm | cpio -diu)
+(cd unwrap; rpm2cpio ../%{expctl_actual_name}.noarch.rpm | cpio -diu)
 
 # 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
 rm -fr $RPM_BUILD_ROOT