X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=2a173796b5014aff2f447c082cee82578b680800;hb=9cf50f2b0222ea7158b8883b9ce3c3d1d01f219b;hp=21e4a67b8ad4c672e0f2c10599810734f3481526;hpb=634d1b85eee2ab5ab0d7dcd5df7b2534a02f7a6b;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 21e4a67..2a17379 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,10 +1,10 @@
 %define name vserver
-%define version 4.0
+%define version 4.1
 %define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
+Distribution: PlanetLab 4.0
 URL: http://cvs.planet-lab.org/cvs/vserver-reference
 
 Summary: VServer reference image
@@ -47,7 +47,7 @@ This package installs the RPMS necessary to create system ("root
 
 %build
 pushd vserver-reference
-./build.sh -r 4
+./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4)
 ./system-packages.sh
 popd
 
@@ -66,19 +66,19 @@ rm -rf $RPM_BUILD_ROOT
 # If run under sudo
 if [ -n "$SUDO_USER" ] ; then
     # Allow user to delete the build directory
-    chown -R $SUDO_USER .
+    chown -h -R $SUDO_USER .
     # Some temporary cdroot files like /var/empty/sshd and
     # /usr/bin/sudo get created with non-readable permissions.
     find . -not -perm +0600 -exec chmod u+rw {} \;
     # Allow user to delete the built RPM(s)
-    chown -R $SUDO_USER %{_rpmdir}/%{_arch}
+    chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
 fi
 
 %files reference
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
 %{_sysconfdir}/cron.d/vserver-reference
-/vservers/vserver-reference
+/vservers/.vref/default
 
 %files system-packages
 %defattr(-,root,root)
@@ -95,8 +95,8 @@ echo $$ > %{vcached_pid}
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp
-if [ -d /vservers/vserver-reference ] ; then
-    mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM
+if [ -d /vservers/.vref ] ; then
+    mv /vservers/.vref /vservers/.vtmp/.vref.$RANDOM
 fi
 if [ -d /vservers/.vcache ] ; then
     mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM