X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=vserver-reference.spec;h=0ac7ff890560f93d9c0c059d90cf60c20e253486;hb=d73867e008eeae0d1f64f08c652a5bdb713f5163;hp=f625b5e6031c05f0190ba4edf1157646499a173e;hpb=5c81fd782694804fb7a5f9743dc7f118efb6375a;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index f625b5e..0ac7ff8 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -7,7 +7,7 @@
 
 %define name vserver
 %define version 4.2
-%define taglevel 16
+%define taglevel 18
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -39,7 +39,6 @@ Summary: VServer reference image
 Group: Applications/System
 AutoReqProv: no
 Requires: util-vserver, e2fsprogs, yum
-Requires(pre): util-vserver-core, findutils
 
 %description %{slicefamily}
 This package creates the virtual server (VServer) reference image used
@@ -59,6 +58,7 @@ This package installs the stubs necessary to create system slices
 %setup -q
 
 %build
+[ -d VserverReference ] || ln -s vserver-reference VserverReference
 pushd VserverReference
 ./build.sh %{pldistro} %{slicefamily}
 popd
@@ -100,12 +100,6 @@ fi
 
 %define vcached_pid /var/run/vcached.pid
 
-# XXX: UGLY HACK
-%pre %{slicefamily}
-test -d /vservers/.vref/%{slicefamily} && \
-   find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
-:
-
 %post %{slicefamily}
 chkconfig --add vserver-reference
 chkconfig vserver-reference on
@@ -119,6 +113,12 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* Thu Jan 13 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - vserver-reference-4.2-18
+- handle directory name change
+
+* Wed Jan 12 2011 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - VserverReference-4.2-17
+- Remove ugly hack that breaks su/sudo on upgrades.
+
 * Tue Oct 20 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-16
 - fix issue about locating the post-install script(s)
 - this was causing the onelab distro to miss the /etc/sudoers patch