X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=aaf961b2ec0c4d652d409aafd43b8871f6524331;hb=ea0f8131c3a4fd50c7c72d0a506533167ac51648;hp=97f73d7a14f749e06dc4dc7e546440f7d47ed35f;hpb=5a949b31060abe2a1cc2d0437dced8dbb01f1026;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 97f73d7..aaf961b 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,11 +1,13 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name vserver
-%define version 4.1
-%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.2
+%define taglevel 2
 
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 4.0
-URL: http://cvs.planet-lab.org/cvs/vserver-reference
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Summary: VServer reference image
 Name: %{name}
@@ -15,8 +17,11 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum
-Requires(pre): coreutils
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 %define debug_package %{nil}
 
@@ -27,6 +32,8 @@ This package does not really exist.
 Summary: VServer reference image
 Group: Applications/System
 AutoReqProv: no
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): /bin/sh, coreutils
 
 %description reference
 This package creates the virtual server (VServer) reference image used
@@ -35,20 +42,19 @@ as the installation base for new PlanetLab slivers.
 %package system-packages
 Summary: System slice packages
 Group: Applications/System
-Requires: vserver-reference = %{version}-%{release}
+Requires: vserver-reference >= %{version}-%{release}
 AutoReqProv: no
 
 %description system-packages
 This package installs the RPMS necessary to create system ("root
- resource") slices from the virtual server (VServer) reference image.
+resource") slices from the virtual server (VServer) reference image.
 
 %prep
 %setup -q
 
 %build
 pushd VserverReference
-./build.sh
-./system-packages.sh
+./build.sh %{pldistro}
 popd
 
 %install
@@ -84,7 +90,7 @@ fi
 
 %files system-packages
 %defattr(-,root,root)
-/vservers/system-packages
+/vservers/.vstub
 
 %define vcached_pid /var/run/vcached.pid
 
@@ -118,6 +124,12 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* Fri Feb 15 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-4.2-1 vserver-4.2-2
+- vserver image to properly use links rather than copies
+
+* Thu Jan 31 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-4.2-0 vserver-4.2-1
+- more careful scan of the vserver-*.pkgs image specifications
+
 * Tue Sep  1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
 - Pre-package vserver-reference instead of building it on nodes