X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=3bebaab9313b901a23c4e1511e54274cab0b6985;hb=ee4ffc22ce762e4fde1ee458cbcd52132667e7d8;hp=3a67eb971c100658e7eee3f279ec33213427fd3b;hpb=8ff59900c5a05a46ee28e23168a02185ff4b94f4;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 3a67eb9..3bebaab 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -3,6 +3,8 @@ %define confdir %_sysconfdir/vservers %define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name +%define __chattr /usr/bin/chattr +%define chkconfig /sbin/chkconfig Summary: Linux virtual server utilities Name: @PACKAGE@ @@ -16,13 +18,20 @@ 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 +BuildRequires: doxygen tetex-latex +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 @@ -31,7 +40,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 +48,7 @@ Group: System Environment/Base Provides: init(@PACKAGE@) Requires: %name = %epoch:%version-%release Requires: initscripts +Requires(pre,postun): %_initrddir %package legacy Summary: Legacy utilities for util-vserver @@ -61,6 +71,7 @@ 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 @@ -75,7 +86,7 @@ set_ipv4root system call. %build %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} all doc %install @@ -87,6 +98,10 @@ 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 @@ -95,33 +110,40 @@ rm -rf $RPM_BUILD_ROOT 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 -/sbin/chkconfig --add rebootmgr +%chkconfig --add vservers +%chkconfig --add rebootmgr +%chkconfig --add vprocunhide for i in %v_services; do - /sbin/chkconfig --add v_$i + %chkconfig --add v_$i done %preun sysv test "$1" != 0 || for i in %v_services; do - /sbin/chkconfig --del v_$i + %chkconfig --del v_$i done -test "$1" != 0 || %{_initrddir}/rebootmgr stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del rebootmgr -test "$1" != 0 || /sbin/chkconfig --del vservers +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 %postun sysv -test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig %files -f %name-base.list @@ -144,6 +166,8 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %dir /var/run/vservers.rev +%files lib -f %name-lib.list + %files core -f %name-core.list %defattr(-,root,root,-) %dir %pkglibdir @@ -157,8 +181,6 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %dir %confdir/.distributions/*/apt %config(noreplace) %confdir/.distributions/*/apt/sources.list -%exclude %_mandir/*/vrpm* - %files legacy -f %name-legacy.list %defattr(-,root,root,-) @@ -173,9 +195,14 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %files devel -f %name-devel.list %defattr(-,root,root,-) +%doc lib/apidoc/latex/refman.pdf +%doc lib/apidoc/html %changelog +* Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0 +- added vprocunhide-service support +- added doxygen support + * Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 - Initial build. -