X-Git-Url: http://git.onelab.eu/?p=omf.git;a=blobdiff_plain;f=omf-resctl.spec;h=85987051e31a29b2943c397f47ad014b2a1c869e;hp=c92e586e5c0699ce2bcdadb4cfed2515a2267d45;hb=HEAD;hpb=b4f292f95db365643b79436d75c536ac73cd1429

diff --git a/omf-resctl.spec b/omf-resctl.spec
index c92e586..8598705 100644
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -1,18 +1,13 @@
-#
-# $Id$
-#
-%define url $URL$
-
-# Marc E. Fiuczynski <mef@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
+# Thierry Parmentelat - INRIA
+# Copyright (C) 2010 INRIA
 # License is GPL.
 
 %define name omf-resctl
 %define version 5.3
-%define taglevel 1
+%define taglevel 11
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu2-2
+%define resctl_actual_name omf-resctl-5.3-5.3.1-1
 
 Summary: OMF Resource Controller - for slivers
 Name: %{name}
@@ -24,12 +19,12 @@ 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)
+URL: %{SCMURL}
+
 BuildArch: noarch
 
-Requires: imagezip
 Requires: pciutils  
 Requires: ruby  
 Requires: wget  
@@ -43,11 +38,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-1ubuntu3-2
+%define common_actual_name omf-common-5.3-5.3.1-1
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -84,7 +79,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 
@@ -92,14 +87,21 @@ make liblog4r
 make libxmpp4r 
 (cd unwrap; rpm2cpio ../%{libxmpp4r_actual_name}.noarch.rpm | cpio -diu)
 
-# cleanup svn sequels
+# remove any default config if any
+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
 rm -fr $RPM_BUILD_ROOT
 
 rsync -a unwrap/ $RPM_BUILD_ROOT
 
+install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -113,10 +115,19 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %post
-mkdir /etc/omf-resctl-5.3/
-# xxx tweak config in /etc/omf-resctl-5.3/
-/sbin/chkconfig --add omf-resctl-5.3
-service omf-resctl-5.3 restart
+if [ -x /sbin/chkconfig ] ; then
+    /sbin/chkconfig --add omf-resctl-%{version}
+    /sbin/chkconfig omf-resctl-%{version} on
+    service omf-resctl-%{version} restart
+fi
+
+%preun
+# 0 = erase, 1 = upgrade
+if [ $1 -eq 0 ] ; then
+    service omf-resctl-%{version} stop
+    /sbin/chkconfig omf-resctl-%{version} off
+    /sbin/chkconfig --del omf-resctl-%{version}
+fi
 
 ####################
 %files -n omf-common
@@ -144,3 +155,33 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 
 ####################
 %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
+
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-2
+- package the exp. controller as well for user convenience
+