X-Git-Url: http://git.onelab.eu/?p=omf.git;a=blobdiff_plain;f=omf-expctl.spec;h=03b4bbfea7667c4c08deb82eea30778741f42e27;hp=d39ead361155a0bb5236d7d88b7dea179aafe779;hb=HEAD;hpb=54849bf2d8bd77962402edae072294abfee1444b

diff --git a/omf-expctl.spec b/omf-expctl.spec
index d39ead3..03b4bbf 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 3
+%define taglevel 11
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu2-2
+%define expctl_actual_name omf-expctl-5.3-5.3.1-1
 
 Summary: OMF Experiment Controller - for end-users
 Name: %{name}
@@ -24,10 +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: %(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
@@ -55,11 +51,12 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir unwrap
 
-make omf-resctl 
-(cd unwrap; rpm2cpio ../%{actual_name}.noarch.rpm | cpio -diu)
+make omf-expctl 
+(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
@@ -73,12 +70,37 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 /etc
-/usr/sbin
-/usr/share/omf-resctl-%{version}
+/usr/bin
+/usr/share/omf-expctl-%{version}
 /usr/share/doc
+/usr/share/man
 
 ####################
 %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
+
+* 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
+
+* Tue Jun 22 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-5
+- cleaned up specfile for smoother upgrades
+
+* Tue May 25 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-4
+- fix stupid typo in tag 5.3-3
+
 * Tue May 25 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-3
 - fetch from the tagged omf-5.3-federation-v1.1 - and turn SHA1SUM checking back on again