X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=32ab3c61be7c4ef78cc8e84613d2c2625cc7bbc5;hb=86a23427cca76a5a9befd60c85535a0e738bc3c6;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..32ab3c6 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++ wget +BuildRequires: e2fsprogs-devel +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} %package core Summary: The core-utilities for util-vserver @@ -28,7 +31,7 @@ Group: Applications/System Summary: Tools which can be used to build vservers Group: Applications/System Requires: %name = %epoch:%version-%release -Requires: rpm apt +Requires: rpm apt wget binutils tar %package sysv Summary: SysV-initscripts for vserver @@ -37,6 +40,11 @@ Provides: init(@PACKAGE@) Requires: %name = %epoch:%version-%release Requires: initscripts +%package legacy +Summary: Legacy utilities for util-vserver +Group: Applications/System +Requires: %name = %epoch:%version-%release + %package devel Summary: Header-files and libraries which are needed to develop vserver based applications Group: Development/Libraries @@ -56,6 +64,7 @@ set_ipv4root system call. %description core %description build %description sysv +%description legacy %description devel @@ -64,19 +73,29 @@ 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 + +contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %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,99 +120,59 @@ test "$1" != 0 || /sbin/chkconfig --del vservers test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : -%files +%post core -p /sbin/ldconfig +%postun core -p /sbin/ldconfig + + +%files -f %name-base.list %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/FAQ.txt -%pkglibdir -%exclude %pkglibdir/distributions -%exclude %pkglibdir/distrib-info -%exclude %pkglibdir/rpm-fake.so -%exclude %pkglibdir/util-vserver-vars -%exclude %pkglibdir/vapt-get* -%exclude %pkglibdir/vrpm* -%exclude %pkglibdir/vserver-build* -%exclude %pkglibdir/vserver-setup* -%exclude %pkglibdir/vunify -%_sbindir/rebootmgr -%_sbindir/vdu -%_sbindir/vfiles -%_sbindir/vkill -%_sbindir/vps -%_sbindir/vpstree -%_sbindir/vserver -%_sbindir/vserver-stat -%_sbindir/vtop -%_mandir/*/* -%exclude %_mandir/*/chbind* -%exclude %_mandir/*/chcontext* -%exclude %_mandir/*/reducecap* -%exclude %_mandir/*/distrib-info* -%exclude %_mandir/*/vserver-copy* -%exclude %_mandir/*/vrpm* - -%dir %confdir/.defaults -%dir %confdir/.defaults/* -%pkglibdir/defaults +%dir %pkglibdir +%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 +%files core -f %name-core.list %defattr(-,root,root,-) -%_sbindir/chbind -%_sbindir/chcontext -%_sbindir/ctx-kill -%_sbindir/new-namespace -%_sbindir/reducecap -%_sbindir/util-vserver-vars -%pkglibdir/util-vserver-vars -%_mandir/*/chbind* -%_mandir/*/chcontext* -%_mandir/*/reducecap* %dir %pkglibdir -%files build +%files build -f %name-build.list %defattr(-,root,root,-) -%_sbindir/vapt-get -%_sbindir/vrpm -%_sbindir/vserver-copy %dir %pkglibdir -%pkglibdir/distributions -%pkglibdir/rpm-fake.so -%pkglibdir/vapt-get* -%pkglibdir/vrpm* -%pkglibdir/vserver-build* -%pkglibdir/vserver-setup* -%pkglibdir/vunify -%_mandir/*/distrib-info* -%_mandir/*/vserver-copy* -%exclude %_mandir/*/vrpm* - %dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt %config(noreplace) %confdir/.distributions/*/apt/sources.list +%exclude %_mandir/*/vrpm* + + +%files legacy -f %name-legacy.list +%defattr(-,root,root,-) +%dir %pkglibdir/legacy %files sysv %defattr(-,root,root,-) -%_initrddir/* +%config %_initrddir/* %config(noreplace) %_sysconfdir/vservers.conf -%files devel +%files devel -f %name-devel.list %defattr(-,root,root,-) -%_includedir/*.h -%_libdir/*.a -%_libdir/pkgconfig/* %changelog