From 29925de9c135019c7471c047f4960aec1abc4bb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 21 May 2008 06:45:20 +0000 Subject: [PATCH] - put gpg key to /etc/pki/rpm-gpg, rfc Changed files: rpm.spec -> 1.837.2.69 --- rpm.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rpm.spec b/rpm.spec index a6eaa94..d7ee0a9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -35,7 +35,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM 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 @@ -203,7 +203,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 @@ -726,7 +725,7 @@ mv -f scripts/{perl.prov,perl.prov.in} mv -f po/{no,nb}.po mv -f po/{sr,sr@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} @@ -790,7 +789,7 @@ sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu %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 \ @@ -1076,7 +1075,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %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 -- 2.44.0