X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=51ba84eb5727ff901fd388ad52282eb5426e65ac;hb=00d1011e5a6f311eca82159c2b994b0e5bd4b6d2;hp=0d8c9548996778dbcbec2095b59b85b3781490b0;hpb=eed3f5314d5f18df5e806cc57f43eeb94a55d1e1;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 0d8c954..51ba84e 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -1,5 +1,9 @@ # $Id$ +## This package understands the following switches: +## --without dietlibc ... disable usage of dietlibc +## --without xalan ... do not require/use the xalan xslt processor + %define confdir %_sysconfdir/vservers %define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name @@ -16,20 +20,21 @@ Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 BuildRoot: %_tmppath/%name-%version-%release-root -Requires: init(@PACKAGE@) +Requires: init(%name) 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: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget BuildRequires: e2fsprogs-devel -BuildRequires: doxygen tetex-latex libxslt +BuildRequires: doxygen tetex-latex Requires(post): %__chattr Requires(pre): %pkglibdir Requires(postun): %pkglibdir %{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24} +%{!?_without_xalan:BuildRequires: xalan-j} %package lib Summary: Dynamic libraries for util-vserver @@ -51,7 +56,7 @@ Requires(postun): %confdir %package sysv Summary: SysV-initscripts for vserver Group: System Environment/Base -Provides: init(@PACKAGE@) +Provides: init(%name) = sysv Requires: make diffutils Requires: initscripts Requires: %name = %epoch:%version-%release @@ -111,6 +116,8 @@ rm -rf $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%_libdir/*.la +MANIFEST_CONFIG='%config' \ +MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat @@ -123,27 +130,26 @@ rm -rf $RPM_BUILD_ROOT %post +test -d /vservers || mkdir -m0000 /vservers +test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg + 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 || : +%_sbindir/setattr --barrier /vservers || : + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%define v_services httpd named portmap sendmail smb sshd xinetd gated %post sysv %chkconfig --add vservers-default %chkconfig --add vprocunhide -for i in %v_services; do - %chkconfig --add v_$i -done %preun sysv -test "$1" != 0 || for i in %v_services; do - %chkconfig --del v_$i -done - test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : test "$1" != 0 || %chkconfig --del vprocunhide @@ -154,17 +160,33 @@ test "$1" != 0 || %chkconfig --del vservers-default test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig +## Temporary workaround to remove old v_* files; it will conflict +## somehow with the -legacy package but can be fixed by reinstalling +## this package. +## TODO: remove me in the final .spec file +%define v_services httpd named portmap sendmail smb sshd xinetd gated +%triggerun sysv -- util-vserver-sysv < 0.30.198 +for i in %v_services; do + %chkconfig --del v_$i || : +done %post legacy %chkconfig --add rebootmgr %chkconfig --add vservers-legacy +for i in %v_services; do + %chkconfig --add v_$i +done + + %preun legacy test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : +test "$1" != 0 || for i in %v_services; do + %chkconfig --del v_$i +done + test "$1" != 0 || %chkconfig --del rebootmgr test "$1" != 0 || %chkconfig --del vservers-legacy @@ -175,7 +197,6 @@ 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 %doc doc/*.html doc/*.css /sbin/vshelper %dir %confdir @@ -186,9 +207,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %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/vshelper @@ -208,13 +226,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %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 -%config(noreplace) %_sysconfdir/vservers.conf %files devel -f %name-devel.list @@ -224,6 +240,20 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Jan 26 2005 Enrico Scholz - 0:0.30.198-0.3 +- updated BuildRequires: +- use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet +- moved the v_* initscripts to legacy +- do not ship the /vservers directory itself; as it is immutable, the + extraction will fail else + +* Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0 +- documented switches for 'rpmbuild' + +* Wed May 26 2004 Enrico Scholz - 0:0.29.215-0 +- (re)added the MANIFEST_* variables which were lost some time ago; + this will preserve %%config files... + * Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0 - use file-list for sysv scripts also