From f90c3447a3615e9df7694e6a3e36a1683d44c71b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 31 Mar 2017 12:16:12 +0300 Subject: [PATCH] gpg path must not depend on %%_prefix and such (#1437726) --- rpm-4.8.1-use-gpg2.patch | 2 +- rpm.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm-4.8.1-use-gpg2.patch b/rpm-4.8.1-use-gpg2.patch index f1dbb56..61ef55e 100644 --- a/rpm-4.8.1-use-gpg2.patch +++ b/rpm-4.8.1-use-gpg2.patch @@ -6,7 +6,7 @@ diff -up rpm-4.8.1/macros.in.gpg2 rpm-4.8.1/macros.in %__cpio @__CPIO@ %__file @__FILE@ -%__gpg @__GPG@ -+%__gpg %{_bindir}/gpg2 ++%__gpg /usr/bin/gpg2 %__grep @__GREP@ %__gzip @__GZIP@ %__id @__ID@ diff --git a/rpm.spec b/rpm.spec index edf4cfc..1301c60 100644 --- a/rpm.spec +++ b/rpm.spec @@ -33,7 +33,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}17%{?dist} +Release: %{?snapver:0.%{snapver}.}18%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -604,6 +604,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Fri Mar 31 2017 Panu Matilainen - 4.13.0.1-18 +- gpg path must not depend on %%_prefix and such (#1437726) + * Mon Mar 27 2017 Panu Matilainen - 4.13.0.1-17 - Work around missing python[23] during build dependency parse - Include ISA in the new python library version dependencies too