X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-resctl.spec;h=56a2c78d5d64839883543a399b01dcfc2f8e75ce;hb=ff8eff232d5b451e3182c37c141b0fd2fcfeaff0;hp=29b8564ef396299a719c3d96f7023b40c230dffc;hpb=a5a13b20320ccc8d62b09b97bfaff9c5ff43aea2;p=omf.git

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 29b8564..56a2c78 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}
@@ -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}
 
@@ -39,11 +39,11 @@ Requires: libxmpp4r
 
 %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-1ubuntu10-2
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -89,7 +89,7 @@ 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 
@@ -104,6 +104,7 @@ 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