X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=fbd8f46457256571acdc826e06fc563bf8d7fca9;hb=004564236085c7fd451e8fb68092a604c2a4bcc7;hp=39cc8ac90ca308ab868f3baa57a3f47e7cd96c35;hpb=5dad5adb45ddd1f42c0e9e7c1d3cf7a0727f2ba5;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 39cc8ac..fbd8f46 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -7,7 +7,7 @@
 
 %define name vserver
 %define version 4.2
-%define taglevel 5
+%define taglevel 11
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -21,6 +21,8 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# this would not be right
+#BuildArch: noarch
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -37,6 +39,7 @@ 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
@@ -97,11 +100,11 @@ fi
 
 %define vcached_pid /var/run/vcached.pid
 
+# XXX: UGLY HACK
 %pre %{slicefamily}
-rm -rf /vservers/.vref/%{slicefamily}
-
-%pre systemslices-%{slicefamily}
-rm -rf /vservers/.vstub/%{slicefamily}
+test -d /vservers/.vref/%{slicefamily} && \
+   find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
+:
 
 %post %{slicefamily}
 chkconfig --add vserver-reference
@@ -116,6 +119,24 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* 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
+
+* Thu Jul 03 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-10
+- Use the correct yum.conf to get access to required packages such as pf2slice.
+
+* Mon Jun 30 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-9
+- Scriptlet fix.
+
+* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-8
+- Unset the immutable and iunlink bits to make sure we can install the package.
+
+* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-7
+- Let rpm remove the files.
+
+* Thu Apr 24 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-6
+- empty change, this should *not* be a noarch package
+
 * Mon Apr 21 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-5
 - tweaked pre script that was removing everything under /vservers/.vref
 - dismantle vcached (as far as this module is concerned)