X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=c4285408d9904c519180c67f431d6e75828fd8e3;hb=f02426c35bd222aa7d8628461bdc4f2ada18a7c8;hp=e08f899c8214b11335bd8999cccf10c108f18530;hpb=0aba96f5d7d5d800cc5d1a452893f772c77fa3a0;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index e08f899..c428540 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 @@ -9,57 +13,71 @@ Summary: Linux virtual server utilities Name: @PACKAGE@ Version: @VERSION@ -Release: 0 +Release: 0.5 Epoch: 0 License: GPL 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 -Requires(post): %__chattr -%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} +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 -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: make diffutils -Requires: %name = %epoch:%version-%release -Requires: initscripts -Requires(pre,postun): %_initrddir %pkglibdir +Summary: SysV-initscripts for vserver +Group: System Environment/Base +Provides: init(%name) = sysv +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 @@ -94,10 +112,12 @@ set_ipv4root system call. %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 +MANIFEST_CONFIG='%config' \ +MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat @@ -113,53 +133,74 @@ 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 || : +%_sbindir/setattr --barrier /vservers || : + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%define v_services httpd named portmap sendmail smb sshd xinetd %post sysv %chkconfig --add vservers-default -%chkconfig --add rebootmgr %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 || %_initrddir/rebootmgr stop &>/dev/null || : test "$1" != 0 || %chkconfig --del vprocunhide -test "$1" != 0 || %chkconfig --del rebootmgr 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 +## 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 + +%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 %doc doc/*.html doc/*.css -%dir %pkglibdir +/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 @@ -168,9 +209,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,-) @@ -179,11 +223,9 @@ 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 -%config(noreplace) %confdir/.distributions/*/apt/sources.list %files legacy -f %name-legacy.list @@ -191,12 +233,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %dir %pkglibdir/legacy -%files sysv -f %name-sysv.list -%defattr(-,root,root,-) -%config %_initrddir/* -%config(noreplace) %_sysconfdir/vservers.conf - - %files devel -f %name-devel.list %defattr(-,root,root,-) %doc lib/apidoc/latex/refman.pdf @@ -204,6 +240,18 @@ 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 + +* 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