X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=0d8c9548996778dbcbec2095b59b85b3781490b0;hb=c3248f9e63fa0cbb86c9afcb4d94c854a1368f16;hp=3bebaab9313b901a23c4e1511e54274cab0b6985;hpb=f68fff9c3c3c7aa758699ad5f4192c161d261e4e;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 3bebaab..0d8c954 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -19,46 +19,60 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(@PACKAGE@) Requires: %name-core = %epoch:%version-%release Requires: %name-lib = %epoch:%version-%release +Requires: diffutils mktemp sed Provides: vserver = %epoch:%version-%release Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute BuildRequires: gcc-c++ wget BuildRequires: e2fsprogs-devel -BuildRequires: doxygen tetex-latex -Requires(post): %__chattr -%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} +BuildRequires: doxygen tetex-latex libxslt +Requires(post): %__chattr +Requires(pre): %pkglibdir +Requires(postun): %pkglibdir +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24} %package lib -Summary: Dynamic libraries for util-vserver -Group: System Environment/Libraries +Summary: Dynamic libraries for util-vserver +Group: System Environment/Libraries %package core -Summary: The core-utilities for util-vserver -Group: Applications/System +Summary: The core-utilities for util-vserver +Group: Applications/System +Requires: util-linux %package build -Summary: Tools which can be used to build vservers -Group: Applications/System -Requires: %name = %epoch:%version-%release -Requires: rpm apt wget binutils tar +Summary: Tools which can be used to build vservers +Group: Applications/System +Requires: rpm apt wget binutils tar e2fsprogs +Requires: %name = %epoch:%version-%release +Requires(pre): %confdir +Requires(postun): %confdir %package sysv -Summary: SysV-initscripts for vserver -Group: System Environment/Base -Provides: init(@PACKAGE@) -Requires: %name = %epoch:%version-%release -Requires: initscripts -Requires(pre,postun): %_initrddir +Summary: SysV-initscripts for vserver +Group: System Environment/Base +Provides: init(@PACKAGE@) +Requires: make diffutils +Requires: initscripts +Requires: %name = %epoch:%version-%release +Requires(post): %chkconfig +Requires(preun): %chkconfig +Requires(pre): %_initrddir %pkglibdir +requires(postun): %_initrddir %pkglibdir %package legacy -Summary: Legacy utilities for util-vserver -Group: Applications/System -Requires: %name = %epoch:%version-%release +Summary: Legacy utilities for util-vserver +Group: Applications/System +Requires: %name = %epoch:%version-%release +Requires(post): %chkconfig +Requires(preun): %chkconfig +Requires(pre): %_initrddir %pkglibdir +requires(postun): %_initrddir %pkglibdir %package devel -Summary: Header-files and libraries which are needed to develop vserver based applications -Group: Development/Libraries -Requires: pkgconfig +Summary: Header-files and libraries which are needed to develop vserver based applications +Group: Development/Libraries +Requires: pkgconfig %description @@ -86,12 +100,14 @@ set_ipv4root system call. %build %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} -%__make %{?_smp_mflags} all doc + +%__make %{?_smp_mflags} all +%__make %{?_smp_mflags} doc %install rm -rf $RPM_BUILD_ROOT -%__make DESTDIR="$RPM_BUILD_ROOT" install install-vserverdir +%__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution rm -f $RPM_BUILD_ROOT/%_libdir/*.la @@ -113,10 +129,9 @@ f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s /var/run/vservers %__chattr +t /vservers || : -%define v_services httpd named portmap sendmail smb sshd xinetd +%define v_services httpd named portmap sendmail smb sshd xinetd gated %post sysv -%chkconfig --add vservers -%chkconfig --add rebootmgr +%chkconfig --add vservers-default %chkconfig --add vprocunhide for i in %v_services; do @@ -130,32 +145,44 @@ test "$1" != 0 || for i in %v_services; do done test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : -test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : test "$1" != 0 || %chkconfig --del vprocunhide -test "$1" != 0 || %chkconfig --del rebootmgr -test "$1" != 0 || %chkconfig --del vservers +test "$1" != 0 || %chkconfig --del vservers-default %postun sysv test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : -test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig +%post legacy +%chkconfig --add rebootmgr +%chkconfig --add vservers-legacy + +%preun legacy +test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : + +test "$1" != 0 || %chkconfig --del rebootmgr +test "$1" != 0 || %chkconfig --del vservers-legacy + +%postun legacy +test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : + + %files -f %name-base.list %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/FAQ.txt -%dir %pkglibdir +%doc doc/*.html doc/*.css +/sbin/vshelper +%dir %confdir %dir %confdefaultdir -%dir %confdefaultdir/init %dir %confdefaultdir/apps -%dir %confdefaultdir/apps/pkgmgmt %dir %confdefaultdir/files +%dir %pkglibdir/defaults %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev @@ -164,9 +191,12 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %dir /var/run/vservers %dir /var/run/vservers.rev +%dir /var/run/vshelper %files lib -f %name-lib.list +%files sysv -f %name-sysv.list + %files core -f %name-core.list %defattr(-,root,root,-) @@ -175,7 +205,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files build -f %name-build.list %defattr(-,root,root,-) -%dir %pkglibdir %dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt @@ -185,11 +214,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files legacy -f %name-legacy.list %defattr(-,root,root,-) %dir %pkglibdir/legacy - - -%files sysv -%defattr(-,root,root,-) -%config %_initrddir/* %config(noreplace) %_sysconfdir/vservers.conf @@ -200,9 +224,13 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0 +- use file-list for sysv scripts also + * Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0 - added vprocunhide-service support - added doxygen support +- updated Requires: * Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 - Initial build.