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=b2c553abf0b1843138b536b7060fdaa4fc5f44f9;hpb=0b2593bb23266d7372e3ac4639c6cd2831520b01;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index b2c553a..8db3194 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -16,19 +16,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: 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 @@ -37,11 +39,12 @@ Group: System Environment/Libraries %package core 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: rpm apt wget binutils tar +Requires: rpm apt wget binutils tar e2fsprogs Requires: %name = %epoch:%version-%release Requires(pre): %confdir Requires(postun): %confdir @@ -49,7 +52,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 @@ -109,6 +112,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 @@ -173,12 +178,10 @@ 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 %dir %confdefaultdir -%dir %confdefaultdir/init %dir %confdefaultdir/apps %dir %confdefaultdir/files %dir %pkglibdir/defaults @@ -190,6 +193,7 @@ 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 @@ -206,13 +210,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 @@ -222,6 +224,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %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