SPECS (rpm-4_4_9): rpm.spec - fix installation of th pgp key.

pluto pluto at pld-linux.org
Wed May 21 12:55:42 CEST 2008


Author: pluto                        Date: Wed May 21 10:55:42 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- fix installation of th pgp key.

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

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.69 SPECS/rpm.spec:1.837.2.70
--- SPECS/rpm.spec:1.837.2.69	Wed May 21 08:45:20 2008
+++ SPECS/rpm.spec	Wed May 21 12:55:37 2008
@@ -726,7 +726,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_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -792,6 +791,8 @@
 rm -rf $RPM_BUILD_ROOT
 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
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	staticLDFLAGS=%{?with_static:-all-static} \
@@ -1306,6 +1307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.70  2008-05-21 10:55:37  pluto
+- fix installation of th pgp key.
+
 Revision 1.837.2.69  2008-05-21 06:45:20  glen
 - put gpg key to /etc/pki/rpm-gpg, rfc
 
================================================================

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



More information about the pld-cvs-commit mailing list