SPECS (rpm-4_4_9): rpm.spec - merge changes from AC-branch, add ac rpm gpg key

[glen]

Author: glen                         Date: Wed Aug 27 21:07:30 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- merge changes from AC-branch, add ac rpm gpg key

---- Files affected:
SPECS:
   rpm.spec (1.837.2.86 -> 1.837.2.87) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.86 SPECS/rpm.spec:1.837.2.87
--- SPECS/rpm.spec:1.837.2.86	Tue Aug 26 20:47:45 2008
+++ SPECS/rpm.spec	Wed Aug 27 23:07:25 2008
@@ -54,6 +54,8 @@
 Source7:	%{name}-compress-doc
 Source8:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source8-md5:	08b29584dd349aac9caa7610131a0a88
+Source81:	ftp://ftp.pld-linux.org/dists/ac/PLD-2.0-Ac-GPG-key.asc
+# Source81-md5:	8e7574d1de2fa95c2c54cd2ee03364c1
 Source9:	%{name}-php-provides
 Source10:	%{name}-php-requires
 Source11:	%{name}.sysinfo
@@ -804,7 +806,8 @@
 install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg}
 
 %if "%{pld_release}" != "ti"
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+install %{SOURCE81} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 %endif
 
 %{__make} install \
@@ -817,8 +820,8 @@
 # first platform file entry can't contain regexps
 %{_target_cpu}-%{_target_vendor}-linux
 
-# x86_64 things
 %ifarch x86_64
+# x86_64 things
 amd64-[^-]*-[Ll]inux(-gnu)?
 x86_64-[^-]*-[Ll]inux(-gnu)?
 %endif
@@ -831,8 +834,8 @@
 x86_64-[^-]*-[Ll]inux(-gnu)?
 %endif
 
-# x86 things
 %ifarch athlon %{x8664}
+# x86 things
 athlon-[^-]*-[Ll]inux(-gnu)?
 %endif
 %ifarch pentium4 athlon %{x8664}
@@ -968,8 +971,11 @@
 
 # If non-zero, all erasures will be automagically repackaged.
 #%%_repackage_all_erasures    1
-EOF
 
+# Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
+# marked as %doc should be installed.
+#%%_excludedocs   1
+EOF
 %endif
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
@@ -1118,7 +1124,7 @@
 
 %if "%{pld_release}" != "ti"
 %dir /etc/pki/rpm-gpg
-/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+/etc/pki/rpm-gpg/*.asc
 %endif
 
 %attr(755,root,root) /bin/rpm
@@ -1133,7 +1139,6 @@
 %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
 %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform
 
-
 %{_mandir}/man8/rpm.8*
 %lang(fr) %{_mandir}/fr/man8/rpm.8*
 %lang(ja) %{_mandir}/ja/man8/rpm.8*
@@ -1347,6 +1352,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.87  2008/08/27 21:07:25  glen
+- merge changes from AC-branch, add ac rpm gpg key
+
 Revision 1.837.2.86  2008/08/26 18:47:45  arekm
 - rel 78; fixed rpm-perl_req-use_base.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.86&r2=1.837.2.87&f=u