X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=498013498d099d0d3973c1dc35ccedd07407c5a7;hb=ffd15e7625263e15204d7025e866c6b453b9786e;hp=66d4b584d8f555c79393fdaf20ab24e48aca3dde;hpb=e9387efb0ba48f07a2db9f4f22902076f41faa05;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 66d4b58..4980134 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,18 +1,20 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name vserver
 %define version 5.0
-%define taglevel 2
+%define taglevel 5
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
+
+# we don't really need the standard postinstall process from rpm that
+# strips files and byte-compiles python files. all files in this
+# package are comming from other rpm files and they've already went
+# through this post install processing. - baris
+%define __os_install_post %{nil}
+
 Summary: VServer reference image for slice family %{slicefamily}
 Name: %{name}
 Version: %{version}
@@ -27,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 %define debug_package %{nil}
 
@@ -39,7 +41,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,14 +60,16 @@ This package installs the stubs necessary to create system slices
 %setup -q
 
 %build
-pushd VserverReference
+[ -d vserver-reference ] || ln -s VserverReference vserver-reference
+
+pushd vserver-reference
 ./build.sh %{pldistro} %{slicefamily}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd VserverReference
+pushd vserver-reference
 install -D -m 755 initscripts/vserver-reference $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
 install -D -m 644 cron.d/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
 install -D -m 644 logrotate/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference
@@ -89,12 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -111,6 +108,15 @@ sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 [ "$PL_BOOTCD" = "1" ] || service vserver-reference force
 
 %changelog
+* Wed Dec 29 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - vserver-reference-5.0-5
+- Remove ugly hack that breaks su/sudo on upgrades.
+
+* Tue Dec 07 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-reference-5.0-4
+- optimize rpm construction - skips stripping and the like
+
+* Mon Jul 05 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - VserverReference-5.0-3
+- module name changes
+
 * Fri Mar 12 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-5.0-2
 - iron out system slices reference image update