X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=e8a741bbe959e66fb00bf9fe8b8ed88f34fe6f46;hb=e8908cbe15719dea123a5122d29841c4d17d999b;hp=6a74161f1504e2c3f9ca7c9f55e18554b292553e;hpb=93d5ddce6b6991688ac6440c1b5593d0a098d544;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 6a74161..e8a741b 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,11 +1,13 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name vserver
-%define version 4.0
-%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.2
+%define taglevel 0
 
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.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,28 +42,28 @@ 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 vserver-reference
-./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { print $4 } ' /etc/fedora-release || echo 4)
-./system-packages.sh
+pushd VserverReference
+./build.sh %{pldistro}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd vserver-reference
+pushd VserverReference
 install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
 install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
+install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference
 find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
 popd
 
@@ -78,11 +85,12 @@ fi
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
 %{_sysconfdir}/cron.d/vserver-reference
+%{_sysconfdir}/logrotate.d/vserver-reference
 /vservers/.vref/default
 
 %files system-packages
 %defattr(-,root,root)
-/vservers/system-packages
+/vservers/.vstub
 
 %define vcached_pid /var/run/vcached.pid