X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=d5e0deefff1ff1e00255e6a4257aeef6571632bd;hb=0d41e94199282ca1d8287851fda78a60c62ce8f2;hp=3222324d89f4547f87c3fd1c28a2374c29e07843;hpb=1431169d7779e46377301f4c0d5d818061526840;p=sliceimage.git diff --git a/vserver-reference.spec b/vserver-reference.spec index 3222324..d5e0dee 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 3 +%define taglevel 6 # 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 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 @@ -91,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 @@ -113,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 +* Mon Jan 24 2011 Thierry Parmentelat - vserver-reference-5.0-6 +- no semantic change - just fixed specfile for git URL + +* Wed Dec 29 2010 Daniel Hokka Zakrisson - vserver-reference-5.0-5 +- Remove ugly hack that breaks su/sudo on upgrades. + +* Tue Dec 07 2010 Thierry Parmentelat - vserver-reference-5.0-4 +- optimize rpm construction - skips stripping and the like + * Mon Jul 05 2010 Baris Metin - VserverReference-5.0-3 - module name changes