%define name vserver
-%define version 4.1
-%define release 1%{?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 3.0
-URL: http://cvs.planet-lab.org/cvs/vserver-reference
+Distribution: PlanetLab 4.0
+URL: https://svn.planet-lab.org/svn/VserverReference/
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
%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 >= %{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
%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