# $Id$
%define confdir %_sysconfdir/vservers
+%define confdefaultdir %confdir/.defaults
%define pkglibdir %_libdir/%name
Summary: Linux virtual server utilities
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
%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
%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
%_sbindir/rebootmgr
%_sbindir/vdu
%_sbindir/vfiles
-%_sbindir/vkill
+%_sbindir/vlimit
%_sbindir/vps
%_sbindir/vpstree
%_sbindir/vserver
%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