X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=2c06616edcb859c8e55c750d9d8d8b581418f2ef;hb=ad02e3aeb096fc7dbac18f891719657c7618c23f;hp=4312f0848ef43e248e9917ce23a599aa0b03fcc5;hpb=714ea335aa0e47a673b765eb894bc02a39466b05;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 4312f08..2c06616 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -6,13 +6,20 @@
 %define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name vserver
-%define version 4.2
-%define taglevel 16
+%define version 5.0
+%define taglevel 3
 
 # 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}
@@ -59,14 +66,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
@@ -105,7 +114,24 @@ M=$((60 * $RANDOM / 32768))
 H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
+%post systemslices-%{slicefamily}
+# need to do this for systemslices, for when a new image shows up
+# we've already the service installed and enabled, as systemslices requires the plain package
+[ "$PL_BOOTCD" = "1" ] || service vserver-reference force
+
 %changelog
+* 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
+- nodefamily is 3-fold with pldistro-fcdistro-arch
+- new module layout
+
 * 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
@@ -186,3 +212,5 @@ sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 * Tue Sep 14 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-1.planetlab
 - initial build
+
+%define module_current_branch 4.2