X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=67386bf32bde67546879373e0e1ec29fa80cdd42;hb=0bf7cee7f4624061ba692c5622cb0a172eb62ba0;hp=9923bf025ea6eacd2e6dade238e43fa06b8b6adf;hpb=ce08acdc622103b29b667069d253b45928c6779c;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 9923bf0..67386bf 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 8
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -21,8 +21,8 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# other archs must be able to install this
-BuildArch: noarch
+# this would not be right
+#BuildArch: noarch
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -39,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
@@ -99,11 +100,10 @@ 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
@@ -118,6 +118,15 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* 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)