+#
+# $Id$
+#
+%define url $URL$
+
%define name vserver
%define version 4.2
-%define release 0%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define taglevel 2
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 4.0
-URL: https://svn.planet-lab.org/svn/VserverReference/
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: VServer reference image
Name: %{name}
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}
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
%package system-packages
Summary: System slice packages
Group: Applications/System
-#Requires: vserver-reference = %{version}-%{release}
-Requires: vserver-reference >= 4.2
+Requires: vserver-reference >= %{version}-%{release}
AutoReqProv: no
%description system-packages
%build
pushd VserverReference
-./build.sh
+./build.sh %{pldistro}
popd
%install
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