X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=cdd7c041cf968a9b16693110d73949b3f8bf8a22;hb=5c49af996cff7636f47369b8384ddc473a707096;hp=bdac8ffe52f67adb4eaf72a492526224149eadbb;hpb=3a700b15ae5e43a6af4feed84613ebda7e95b9d7;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index bdac8ff..cdd7c04 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,11 +1,11 @@
 %define name vserver
-%define version 4.1
-%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.2
+%define release 0%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab 4.0
-URL: http://cvs.planet-lab.org/cvs/vserver-reference
+URL: https://svn.planet-lab.org/svn/VserverReference/
 
 Summary: VServer reference image
 Name: %{name}
@@ -35,20 +35,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
@@ -57,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 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 +78,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