X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-expctl.spec;h=aa9f8f0894ce8a68d80558b22e724b76bd62a6fb;hb=51bfaf5c4edb986f2844d28920f8015559ffee83;hp=fb5c098880eaa78e5e59bae09df2e92a7e3aae3a;hpb=7eb57a1e9e361321cdc67faae2a17c9d9f895e7c;p=omf.git

diff --git a/omf-expctl.spec b/omf-expctl.spec
index fb5c098..aa9f8f0 100644
--- a/omf-expctl.spec
+++ b/omf-expctl.spec
@@ -1,18 +1,13 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # Thierry Parmentelat - INRIA
 # Copyright (C) 2010 INRIA
 # License is GPL.
 
 %define name omf-expctl
 %define version 5.3
-%define taglevel 6
+%define taglevel 9
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-expctl-5.3-1ubuntu6-2
+%define expctl_actual_name omf-resctl-5.3-1ubuntu11-2
 
 Summary: OMF Experiment Controller - for end-users
 Name: %{name}
@@ -26,8 +21,9 @@ BuildRoot: %{_tmppath}/%{plc_name}-buildroot
 Vendor: NICTA
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: %{pldistro} %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
-# BuildArch: noarch
+URL: %{SCMURL}
+
+BuildArch: noarch
 
 Requires: pciutils  
 Requires: ruby  
@@ -39,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
@@ -56,7 +52,7 @@ 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
@@ -79,6 +75,15 @@ rm -rf $RPM_BUILD_ROOT
 
 ####################
 %changelog
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-9
+- no semantic change - just fixed specfile for git URL
+
+* Mon Aug 30 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-8
+- new packages from NICTA
+
+* Tue Jul 13 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-7
+- fix omf-expctl build
+
 * Thu Jul 08 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - omf-5.3-6
 - updated omf packages