catching up with the packages recently upgraded by NICTA

diff --git a/Makefile b/Makefile
index bfc9048..960d2c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,35 +2,28 @@
 WEBFETCH               := curl -H Pragma: -O -R -S --fail --show-error
 SHA1SUM                        := sha1sum
 
-#REPO :=       http://pkg.mytestbed.net/omf-5.3-federation-v1.1/yum/base/8/i386/
-#REPO :=       http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.1
-#REPO :=               http://pkg.mytestbed.net/rpm/5.3/f14/x86_64/
-REPO :=        http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.2
+#http://pkg.mytestbed.net/rpm/5.3/f14/noarch/ and x86_64
+REPO :=        http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.3
 
 ALL += omf-resctl
-omf-resctl-URL         := $(REPO)/omf-resctl-5.3-1ubuntu11-2.noarch.rpm
-omf-resctl-SHA1SUM     := e1cbc5cd4d492da16dc95d2d51c0a0e87836919a
+omf-resctl-URL         := $(REPO)/omf-resctl-5.3-5.3.1-1.noarch.rpm
+omf-resctl-SHA1SUM     := 7dcac5c8b0942566d2f0a503ce28126e79e60dbb
 omf-resctl             := $(notdir $(omf-resctl-URL))
 ALL += omf-common
-omf-common-URL         := $(REPO)/omf-common-5.3-1ubuntu10-2.noarch.rpm
-omf-common-SHA1SUM     := 9eb16107965ecc29bf54aca964ccfe898085c415
+omf-common-URL         := $(REPO)/omf-common-5.3-5.3.1-1.noarch.rpm
+omf-common-SHA1SUM     := fa7df2e9513f165856699aeceff7d044dd709729
 omf-common             := $(notdir $(omf-common-URL))
 ALL += liblog4r
 liblog4r-URL           := $(REPO)/liblog4r-ruby1.8-1.2-1.noarch.rpm
-liblog4r-SHA1SUM       := d79d8efb0e80655e3b80c1260433dd4537529064
+liblog4r-SHA1SUM       := 32809abc26d26d9341a3bf14169701818ec61c5f
 liblog4r               := $(notdir $(liblog4r-URL))
 ALL += libxmpp4r
 libxmpp4r-URL          := $(REPO)/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
-libxmpp4r-SHA1SUM      := 29c985034d45d5aad8de4b1b87e9f4b753593e2a
+libxmpp4r-SHA1SUM      := 6847f8a74e7f1e54af76f0cedd6d7582011fa037
 libxmpp4r              := $(notdir $(libxmpp4r-URL))
-#ALL += imagezip
-#imagezip-URL          := $(REPO)/imagezip-1.0.0-3.i386.rpm
-#imagezip-SHA1SUM      := 88088ca0aed57edc2b6ad6acc65a0038486fe67e
-#imagezip              := $(notdir $(imagezip-URL))
-
 ALL += omf-expctl
-omf-expctl-URL         := $(REPO)/omf-expctl-5.3-1ubuntu13-2.noarch.rpm
-omf-expctl-SHA1SUM     := 44ea2bc89af5198d1a9f3d2d94bc3eeb93c30c7f
+omf-expctl-URL         := $(REPO)/omf-expctl-5.3-5.3.1-1.noarch.rpm
+omf-expctl-SHA1SUM     := 10ffd10a56c93db4d909cdb4e720f845ab11cf72
 omf-expctl             := $(notdir $(omf-expctl-URL))
 
 all: $(ALL)
@@ -58,7 +51,6 @@ $(eval $(call download_target,omf-resctl))
 $(eval $(call download_target,omf-common))
 $(eval $(call download_target,liblog4r))
 $(eval $(call download_target,libxmpp4r))
-#$(eval $(call download_target,imagezip))
 
 $(eval $(call download_target,omf-expctl))
 
@@ -66,14 +58,6 @@ clean:
        rm -f $(CLEAN)
 .PHONY: clean
 
-repobase:=$(subst http://pkg.mytestbed.net/,,$(subst /yum/base/8/i386/,,$(REPO)))
-# this echoes a script that can be ran on the mirror
-mirror: 
-       @( echo mkdir -p $(repobase); echo cd $(repobase) ; \
-         $(foreach target,$(ALL), echo curl -O $(REPO)/$($(target)) ; ) )
-
-.PHONY: mirror
-
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
 # make ++foo : idem but verbose, i.e. foo=$(foo)

diff --git a/omf-expctl.spec b/omf-expctl.spec
index d9c1e3b..b77778b 100644 (file)
--- a/omf-expctl.spec
+++ b/omf-expctl.spec
@@ -7,7 +7,7 @@
 %define taglevel 10
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define expctl_actual_name omf-resctl-5.3-1ubuntu11-2
+%define expctl_actual_name omf-expctl-5.3-5.3.1-1
 
 Summary: OMF Experiment Controller - for end-users
 Name: %{name}
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir unwrap
 
-make omf-resctl 
+make omf-expctl 
 (cd unwrap; rpm2cpio ../%{expctl_actual_name}.noarch.rpm | cpio -diu)
 
 # cleanup any svn sequels
@@ -70,9 +70,10 @@ 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

diff --git a/omf-resctl.spec b/omf-resctl.spec
index ba3c505..24cf356 100644 (file)
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -7,7 +7,7 @@
 %define taglevel 10
 
 %define plc_name %{name}-%{version}-%{taglevel}
-%define resctl_actual_name omf-resctl-5.3-1ubuntu11-2
+%define resctl_actual_name omf-resctl-5.3-5.3.1-1
 
 Summary: OMF Resource Controller - for slivers
 Name: %{name}
@@ -35,7 +35,6 @@ Requires: rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 Requires: omf-common  
 Requires: liblog4r
 Requires: libxmpp4r
-#Requires: imagezip
 
 %description 
 The OMF Resource Controller (RC) is the experiment-side of the
@@ -43,7 +42,7 @@ 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-1ubuntu10-2
+%define common_actual_name omf-common-5.3-5.3.1-1
 
 %package -n omf-common
 Summary: OMF common utilities 
@@ -69,15 +68,6 @@ Group: System Environment/Base
 %description -n libxmpp4r
 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
-
 ####################
 
 %prep
@@ -96,8 +86,6 @@ make liblog4r
 (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)
 
 # remove any default config if any
 rm -f unwrap/etc/omf-resctl-%{version}/omf-resctl.yaml
@@ -165,14 +153,6 @@ ln -s /usr/bin/ruby /usr/bin/ruby1.8
 /usr/lib/ruby/1.8/xmpp4r
 /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
-
 ####################
 %changelog
 * Tue Feb 01 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-10