X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=1ed8789474b23b73afd1844ae376d34fa314433f;hb=65cce8e99179cb342f3907182b83ac18c3dfaa36;hp=fbd8f46457256571acdc826e06fc563bf8d7fca9;hpb=004564236085c7fd451e8fb68092a604c2a4bcc7;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index fbd8f46..1ed8789 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -7,7 +7,7 @@
 
 %define name vserver
 %define version 4.2
-%define taglevel 11
+%define taglevel 17
 
 # 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,25 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* 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
+
+* Mon Oct 19 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - VserverReference-4.2-15
+- - comment out requiretty
+
+* Fri Oct 09 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-14
+- can use groups in the pkgs file with +++ for space
+
+* Mon Aug 10 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - VserverReference-4.2-13
+- Added remove for all VROOTs rather than the last one.  BUG FIX.
+
+* Tue Mar 24 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-12
+- fix for fedora 10
+
 * Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-11
 - on 64bits archs, locates util-vserver's config file correctly