X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=8db31948b4c49fb1528f8399b6259d250f8f7f0c;hb=702ac5383430e4dd00f3610a78dadf6f84e4296b;hp=f1171bacd25b8ef314c39758fbeb912aed3d2681;hpb=2aa7a6efd177903fb58742273367d8ad1e235780;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index f1171ba..8db3194 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -4,6 +4,7 @@ %define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name %define __chattr /usr/bin/chattr +%define chkconfig /sbin/chkconfig Summary: Linux virtual server utilities Name: @PACKAGE@ @@ -15,42 +16,64 @@ 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: gcc-c++ wget BuildRequires: e2fsprogs-devel -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 %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 +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 @@ -63,6 +86,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 @@ -77,18 +101,26 @@ set_ipv4root system call. %build %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} -%__make %{?_smp_mflags} + +%__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 +MANIFEST_CONFIG='%config' \ +MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat +%check || : +%__make check + + %clean rm -rf $RPM_BUILD_ROOT @@ -97,47 +129,62 @@ 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 +%define v_services httpd named portmap sendmail smb sshd xinetd gated %post sysv -/sbin/chkconfig --add vservers -/sbin/chkconfig --add rebootmgr +%chkconfig --add vservers-default +%chkconfig --add vprocunhide for i in %v_services; do - /sbin/chkconfig --add v_$i + %chkconfig --add v_$i done -%__chattr +t /vservers || : - %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 || %chkconfig --del vprocunhide +test "$1" != 0 || %chkconfig --del vservers-default %postun sysv -test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/vprocunhide 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 || : -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +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 @@ -146,6 +193,11 @@ 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 @@ -155,13 +207,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 - -%exclude %_mandir/*/vrpm* %files legacy -f %name-legacy.list @@ -169,17 +217,24 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %dir %pkglibdir/legacy -%files sysv -%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 +%doc lib/apidoc/html %changelog +* 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 + +* 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. -