SPECS (rpm-4_4_9): rpm.spec - put gpg key to /etc/pki/rpm-gpg, rfc

[glen]

Author: glen                         Date: Wed May 21 06:45:25 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- put gpg key to /etc/pki/rpm-gpg, rfc

---- Files affected:
SPECS:
   rpm.spec (1.837.2.68 -> 1.837.2.69) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.68 SPECS/rpm.spec:1.837.2.69
--- SPECS/rpm.spec:1.837.2.68	Sat May 17 16:49:27 2008
+++ SPECS/rpm.spec	Wed May 21 08:45:20 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	ĐœĐľĐ˝ĐľĐ´ĐśĐľŃ€ пакотів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	68.1
+Release:	68.2
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -204,7 +204,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
 
@@ -727,7 +726,7 @@
 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
+cp %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -791,7 +790,7 @@
 
 %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}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -1077,7 +1076,9 @@
 %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
 
 %attr(755,root,root) /bin/rpm
 #%attr(755,root,root) %{_bindir}/rpmdb
@@ -1305,6 +1306,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.69  2008-05-21 06:45:20  glen
+- put gpg key to /etc/pki/rpm-gpg, rfc
+
 Revision 1.837.2.68  2008-05-17 14:49:27  megabajt
 - added -mimetype.patch; rpm will generate automatically mimetype(...) provides
   for packages at build time
================================================================

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