-#
-# $Id$
-#
-%define url $URL$
-
# Thierry Parmentelat - INRIA
# Copyright (C) 2010 INRIA
# License is GPL.
%define name omf-resctl
%define version 5.3
-%define taglevel 2
+%define taglevel 9
%define plc_name %{name}-%{version}-%{taglevel}
-%define actual_name omf-resctl-5.3-1ubuntu2-2
+%define actual_name omf-resctl-5.3-1ubuntu10-2
Summary: OMF Resource Controller - for slivers
Name: %{name}
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
Requires: omf-common
Requires: liblog4r
Requires: libxmpp4r
-Requires: imagezip
+#Requires: imagezip
%description
The OMF Resource Controller (RC) is the experiment-side of the
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-1ubuntu9-2
%package -n omf-common
Summary: OMF common utilities
An XMPP/Jabber library for Ruby, needed by OMF software
####################
-%define imagezip_actual_name imagezip-1.0.0-3
-
-%package -n imagezip
-Summary: filesystem image compression tool from EMULAB
-Group: System Environment/Base
-%description -n imagezip
-filesystem image compression tool from EMULAB
+#%define imagezip_actual_name imagezip-1.0.0-3
+#
+#%package -n imagezip
+#Summary: filesystem image compression tool from EMULAB
+#Group: System Environment/Base
+#%description -n imagezip
+#filesystem image compression tool from EMULAB
####################
(cd unwrap; rpm2cpio ../%{liblog4r_actual_name}.noarch.rpm | cpio -diu)
make libxmpp4r
(cd unwrap; rpm2cpio ../%{libxmpp4r_actual_name}.noarch.rpm | cpio -diu)
-make imagezip
-(cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
+#make imagezip
+#(cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
# remove any default config if any
rm -f unwrap/etc/omf-resctl-%{version}/omf-resctl.yaml
#
%post
-/sbin/chkconfig --add omf-resctl-%{version}
-/sbin/chkconfig omf-resctl-%{version} on
-service omf-resctl-%{version} 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
-service omf-resctl-%{version} stop
-/sbin/chkconfig omf-resctl-%{version} off
-/sbin/chkconfig --del omf-resctl-%{version}
+# 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
/usr/share/doc/libxmpp4r-ruby1.8
####################
-%files -n imagezip
-%defattr(-,root,root)
-/usr/bin/imagedump
-/usr/bin/imageunzip
-/usr/bin/imagezip
-/usr/share/doc/imagezip
+#%files -n imagezip
+#%defattr(-,root,root)
+#/usr/bin/imagedump
+#/usr/bin/imageunzip
+#/usr/bin/imagezip
+#/usr/share/doc/imagezip
####################
%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
+
+* 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