X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=fe9d9f02fb11be5413a5dd59afc29e948a7b580b;hb=b38d70e7594b43cdd63b9e27ea5783001ef8407c;hp=353c229df90e30a8b5ea654d333d7b9ab5eda470;hpb=151bd1c55b732c22d43567edb68a160fdcdfbb3d;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 353c229..fe9d9f0 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -1,6 +1,7 @@ # $Id$ %define confdir %_sysconfdir/vservers +%define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name Summary: Linux virtual server utilities @@ -19,7 +20,8 @@ Provides: vserver = %epoch:%version-%release Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute BuildRequires: gcc-c++ -%{!?_without_dietlibc:BuildRequires: dietlibc} +BuildRequires: e2fsprogs-devel +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} %package core Summary: The core-utilities for util-vserver @@ -79,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT 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" + + %define v_services httpd named portmap sendmail smb sshd xinetd %post sysv /sbin/chkconfig --add vservers @@ -120,6 +127,7 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %_sbindir/rebootmgr %_sbindir/vdu %_sbindir/vfiles +%_sbindir/vlimit %_sbindir/vps %_sbindir/vpstree %_sbindir/vserver @@ -133,16 +141,20 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %exclude %_mandir/*/vserver-copy* %exclude %_mandir/*/vrpm* -%dir %confdir/.defaults -%dir %confdir/.defaults/* -%pkglibdir/defaults +%dir %confdefaultdir +%dir %confdefaultdir/init +%dir %confdefaultdir/apps +%dir %confdefaultdir/apps/pkgmgmt +%dir %confdefaultdir/files +%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/vservers.rev %files core