X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=9b37aa2194067ce8a44124aaa0805a01f4e72af7;hb=e035f164c858115c488d0f2fc1e0d356a9096996;hp=49d26cf73b204625842389741273360b80b272b9;hpb=315be55f0ec49076849caeaa4ca08d83e543cf16;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 49d26cf..9b37aa2 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -1,7 +1,9 @@ # $Id$ %define confdir %_sysconfdir/vservers +%define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name +%define __chattr /usr/bin/chattr Summary: Linux virtual server utilities Name: @PACKAGE@ @@ -15,13 +17,19 @@ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%n BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(@PACKAGE@) Requires: %name-core = %epoch:%version-%release +Requires: %name-lib = %epoch:%version-%release Provides: vserver = %epoch:%version-%release Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ wget BuildRequires: e2fsprogs-devel +Requires(post): %__chattr %{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} +%package lib +Summary: Dynamic libraries for util-vserver +Group: System Environment/Libraries + %package core Summary: The core-utilities for util-vserver Group: Applications/System @@ -30,7 +38,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 @@ -39,6 +47,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 @@ -55,9 +68,11 @@ can't interact with services in the main server. This requires a special kernel supporting the new new_s_context and set_ipv4root system call. +%description lib %description core %description build %description sysv +%description legacy %description devel @@ -75,11 +90,26 @@ set_ipv4root system call. rm -rf $RPM_BUILD_ROOT %__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 + + +%check || : +%__make check + %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" + +%__chattr +t /vservers || : + + %define v_services httpd named portmap sendmail smb sshd xinetd %post sysv /sbin/chkconfig --add vservers @@ -104,39 +134,22 @@ test "$1" != 0 || /sbin/chkconfig --del vservers test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : -%files +%post lib -p /sbin/ldconfig +%postun lib -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/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 @@ -145,60 +158,37 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %dir /var/run/vservers.rev +%files lib -f %name-lib.list -%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 +%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 * Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 - Initial build. -