From 4ab33459a5c2fa621ddaf698023c0c96ed237ce5 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 23 Mar 2005 02:04:12 +0000 Subject: [PATCH] copy GPG keys from the system into the confdir buildrequire dietlibc-0.25 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1960 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/util-vserver.spec.in | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 3d4a161..438ae70 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -18,7 +18,7 @@ Summary: Linux virtual server utilities Name: @PACKAGE@ Version: @VERSION@ -Release: %release_func 0 +Release: %release_func 0.13 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -37,7 +37,7 @@ BuildRequires: doxygen tetex-latex Requires(post): %__chattr Requires(pre): %pkglibdir Requires(postun): %pkglibdir -%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24} +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.25} %{!?_without_xalan:BuildRequires: xalan-j} %package lib @@ -164,6 +164,26 @@ test "$1" != 0 || %chkconfig --del vservers-default test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : +%triggerin build -- fedora-release +function copy() +{ + base=$1 + shift + + for i; do + test -r "$i" || continue + + target=%confdir/.distributions/.common/pubkeys/$base-$(basename "$i") + cp -a "$i" "$target" + done +} +copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* + + +%preun build +test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-* + + ## Temporary workaround to remove old v_* files; it will conflict ## somehow with the -legacy package but can be fixed by reinstalling ## this package. @@ -230,6 +250,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt +%dir %confdir/.distributions/.common +%dir %confdir/.distributions/.common/pubkeys +%dir %confdefaultdir/apps/vunify +%dir %confdefaultdir/apps/vunify/hash %files legacy -f %name-legacy.list -- 1.8.1.5