X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=b2d710f81d6f9daa383d06b3bccbb3cf86c7e2f7;hb=bca369849d17e3b0b68b9038a354b69e3a6acfc3;hp=0053782a8b69da4c6ae2b8ed31aa56c0a0c99c09;hpb=664a2382fb4f742dae58e0bf544a6c3b3153f622;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 0053782..b2d710f 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 @@ -18,7 +19,9 @@ Requires: %name-core = %epoch:%version-%release Provides: vserver = %epoch:%version-%release Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute -BuildRequires: dietlibc gcc-c++ +BuildRequires: gcc-c++ +BuildRequires: e2fsprogs-devel +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} %package core Summary: The core-utilities for util-vserver @@ -64,19 +67,27 @@ set_ipv4root system call. %build -%configure --with-initrddir=%_initrddir --enable-release +%configure --with-initrddir=%_initrddir --enable-release \ + %{?_without_dietlibc:--disable-dietlibc} %__make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%__make DESTDIR="$RPM_BUILD_ROOT" install +%__make DESTDIR="$RPM_BUILD_ROOT" install install-vserverdir + +rm -f $RPM_BUILD_ROOT/%_libdir/*.la %clean 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 @@ -101,6 +112,10 @@ test "$1" != 0 || /sbin/chkconfig --del vservers test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +%post core -p /sbin/ldconfig +%postun core -p /sbin/ldconfig + + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS @@ -115,14 +130,16 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %exclude %pkglibdir/vserver-build* %exclude %pkglibdir/vserver-setup* %exclude %pkglibdir/vunify +%_sbindir/exec-cd %_sbindir/rebootmgr %_sbindir/vdu %_sbindir/vfiles -%_sbindir/vkill +%_sbindir/vlimit %_sbindir/vps %_sbindir/vpstree %_sbindir/vserver %_sbindir/vserver-stat +%_sbindir/vserver-info %_sbindir/vtop %_mandir/*/* %exclude %_mandir/*/chbind* @@ -132,25 +149,30 @@ 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 %defattr(-,root,root,-) +%_libdir/*.so.* %_sbindir/chbind %_sbindir/chcontext -%_sbindir/ctx-kill %_sbindir/new-namespace %_sbindir/reducecap +%_sbindir/vkill %_sbindir/util-vserver-vars %pkglibdir/util-vserver-vars %_mandir/*/chbind* @@ -193,6 +215,7 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %defattr(-,root,root,-) %_includedir/*.h %_libdir/*.a +%_libdir/*.so %_libdir/pkgconfig/*