X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=80167e318084435dce1fc4b423416b7b5eb96896;hb=dcd10dc30d3757e16c579022c8c06c43ffa09a31;hp=22b79dad054bf22362f94de12f4082d3ccdf3f62;hpb=e15c3540a3f63352d0dc5ea44820891024527ade;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 22b79da..80167e3 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -7,12 +7,19 @@
 
 %define name vserver
 %define version 5.0
-%define taglevel 1
+%define taglevel 4
 
 # 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}
@@ -39,7 +46,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 +65,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 +97,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 +113,15 @@ sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 [ "$PL_BOOTCD" = "1" ] || service vserver-reference force
 
 %changelog
+* 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
+
 * Fri Jan 29 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-5.0-1
 - first working version of 5.0:
 - pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to