X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=01f05c6a681065da95f397e52c8049173b314a3f;hb=bb95a260f18983e80abcad495bd224b386a705e1;hp=251d23495be5732273474eadb6790d3c3e261b6f;hpb=424b02fe7e98a321fbfa2a5e92ff9bc60f5674d8;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 251d234..01f05c6 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -10,10 +10,12 @@ %define __chattr /usr/bin/chattr %define chkconfig /sbin/chkconfig +%define _localstatedir %_var + Summary: Linux virtual server utilities Name: @PACKAGE@ Version: @VERSION@ -Release: 0.3 +Release: 0 Epoch: 0 License: GPL Group: System Environment/Base @@ -130,12 +132,19 @@ rm -rf $RPM_BUILD_ROOT %post -f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" -f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s /var/run/vservers.rev "$f" +test -d /vservers || mkdir -m0000 /vservers +test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg + +f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" +f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" %_sbindir/setattr --barrier /vservers || : +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + %post sysv %chkconfig --add vservers-default %chkconfig --add vprocunhide @@ -153,17 +162,13 @@ test "$1" != 0 || %chkconfig --del vservers-default test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - ## Temporary workaround to remove old v_* files; it will conflict ## somehow with the -legacy package but can be fixed by reinstalling ## this package. ## TODO: remove me in the final .spec file %define v_services httpd named portmap sendmail smb sshd xinetd gated -%triggerun sysv -- util-vserver-sysv<0.30.198 -test "$1" != 0 || for i in %v_services; do +%triggerun sysv -- util-vserver-sysv < 0.30.198 +for i in %v_services; do %chkconfig --del v_$i || : done @@ -204,12 +209,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev -%attr(000,root,root) %dir /vservers/.pkg -%attr(000,root,root) %dir /vservers - -%dir /var/run/vservers -%dir /var/run/vservers.rev -%dir /var/run/vshelper +%dir %_localstatedir/run/vservers +%dir %_localstatedir/run/vservers.rev +%dir %_localstatedir/run/vshelper %files lib -f %name-lib.list @@ -243,7 +245,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : * Wed Jan 26 2005 Enrico Scholz - 0:0.30.198-0.3 - updated BuildRequires: - use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet -- moved the v_* initscripts to legacy +- moved the v_* initscripts to legacy +- do not ship the /vservers directory itself; as it is immutable, the + extraction will fail else * Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0 - documented switches for 'rpmbuild'