rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

gpg path must not depend on %%_prefix and such (#1437726)

Browse Source
This commit is contained in:
Panu Matilainen 2017-03-31 12:16:12 +03:00
parent b9ddc1fd31
commit f90c3447a3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4.8.1-use-gpg2.patch
View File

@ -6,7 +6,7 @@ diff -up rpm-4.8.1/macros.in.gpg2 rpm-4.8.1/macros.in
%__cpio @__CPIO@ %__cpio @__CPIO@
%__file @__FILE@ %__file @__FILE@
-%__gpg @__GPG@ -%__gpg @__GPG@
+%__gpg %{_bindir}/gpg2 +%__gpg /usr/bin/gpg2
%__grep @__GREP@ %__grep @__GREP@
%__gzip @__GZIP@ %__gzip @__GZIP@
%__id @__ID@ %__id @__ID@

5
rpm.spec
View File

@ -33,7 +33,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}17%{?dist} Release: %{?snapver:0.%{snapver}.}18%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@ -604,6 +604,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Fri Mar 31 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-18
- gpg path must not depend on %%_prefix and such (#1437726)
* Mon Mar 27 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-17 * Mon Mar 27 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-17
- Work around missing python[23] during build dependency parse - Work around missing python[23] during build dependency parse
- Include ISA in the new python library version dependencies too - Include ISA in the new python library version dependencies too