X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=a74c070ac0779f77d28ec76cf8a025e766c820dc;hb=5b39edfee423f5f3cbe8fa223dcfdc9e8d66e286;hp=ce9f094d97bb301522f2267331625ee39338db63;hpb=e751f4b73f89e5bfbaafa82703d3d8e14132f7a5;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index ce9f094..a74c070 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -13,7 +13,7 @@ %global _localstatedir %_var -%{!?release_func:%global release_func() %1} +%{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities Name: @PACKAGE@ @@ -22,7 +22,8 @@ Release: %release_func 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 +Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2 +#Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -31,7 +32,7 @@ Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables -BuildRequires: gcc-c++ wget +BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex Requires(post): %__chattr @@ -52,11 +53,15 @@ Requires: util-linux %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm apt wget binutils tar e2fsprogs +Requires: rpm wget binutils tar e2fsprogs Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir +%ifarch %ix86 +Requires: apt +%endif + %package sysv Summary: SysV-initscripts for vserver Group: System Environment/Base @@ -79,9 +84,10 @@ Requires(pre): %_initrddir %pkglibdir requires(postun): %_initrddir %pkglibdir %package devel -Summary: Header-files and libraries which are needed to develop vserver based applications +Summary: Header-files and libraries needed to develop vserver based applications Group: Development/Libraries Requires: pkgconfig +Requires: %name-lib = %version-%release %description @@ -232,7 +238,11 @@ function copy() cp -a "$i" "$target" done } + copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* +copy fedora /etc/pki/rpm-gpg/RPM-GPG-* + +copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* %preun build @@ -302,6 +312,7 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files build -f %name-build.list %defattr(-,root,root,-) +%doc contrib/yum*.patch %dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt @@ -323,18 +334,30 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 +- updated URLs + +* Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 +- version 0.30.208 +- require the -lib subpackage by -devel +- copy GPG keys from /etc/pki/rpm-gpg/ + +* Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 +- added patches to make yum work in chroot environments +- version 0.30.206 + * Thu Mar 24 2005 Enrico Scholz - 0:0.30.205-0 -- added some %descriptions +- added some %%descriptions - copy GPG keys from the system into the confdir - buildrequire dietlibc-0.25 - BuildRequire beecrypt-devel - cleanups -- use %global instead of %define +- use %%global instead of %%define - removed 'run.rev' as a vserver-local variable and made it a system-wide setting * 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 +- 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