SPECS (AC-branch): rpm.spec - include th gpg key

[glen]

Author: glen                         Date: Wed Aug 27 20:56:54 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- include th gpg key

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.52 -> 1.837.2.42.2.53) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.52 SPECS/rpm.spec:1.837.2.42.2.53
--- SPECS/rpm.spec:1.837.2.42.2.52	Wed Aug 27 22:51:12 2008
+++ SPECS/rpm.spec	Wed Aug 27 22:56:48 2008
@@ -48,7 +48,10 @@
 Source5:	%{name}-hrmib-cache
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-compress-doc
-Source8:	RPM-GPG-KEY
+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
@@ -204,7 +207,6 @@
 %define		__newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
 
 %define		_rpmlibdir /usr/lib/rpm
-%define		_noautocompressdoc	RPM-GPG-KEY
 
 %define		specflags	-fno-strict-aliasing
 
@@ -729,7 +731,6 @@
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at Latn}.po
 rm -rf sqlite zlib db db3 popt rpmdb/db.h
-cp %{SOURCE8} RPM-GPG-KEY
 
 %patch1067 -p1
 %patch1069 -p1
@@ -797,7 +798,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib}
+install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg}
+
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+install %{SOURCE81} $RPM_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -1119,7 +1123,10 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README wdj/JBJ-GPG-KEY manual/*
-%doc RPM-GPG-KEY
+
+%dir /etc/pki/rpm-gpg
+/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+/etc/pki/rpm-gpg/PLD-2.0-Ac-GPG-key.asc
 
 %attr(755,root,root) /bin/rpm
 #%attr(755,root,root) %{_bindir}/rpmdb
@@ -1346,6 +1353,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.53  2008/08/27 20:56:48  glen
+- include th gpg key
+
 Revision 1.837.2.42.2.52  2008/08/27 20:51:12  glen
 - match upper case 'Linux' in platform file too (some foreign packages use that) (jajcus at rpm-4_4_9)
 
================================================================

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