From d8b230b99250c292f9b979f6fca4bb46826bfd64 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 19 Jun 2019 09:39:06 +0300 Subject: [PATCH] Drop buildarch again now that python_provide no longer needs it (#1720139) --- rpm-4.14.90-enable-buildarch-macro.patch | 13 ------------- rpm.spec | 7 ++++--- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 rpm-4.14.90-enable-buildarch-macro.patch diff --git a/rpm-4.14.90-enable-buildarch-macro.patch b/rpm-4.14.90-enable-buildarch-macro.patch deleted file mode 100644 index ca045b4..0000000 --- a/rpm-4.14.90-enable-buildarch-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/parsePreamble.c b/build/parsePreamble.c -index f29434276..e7cfdee51 100644 ---- a/build/parsePreamble.c -+++ b/build/parsePreamble.c -@@ -1039,7 +1039,7 @@ static struct PreambleRec_s const preambleList[] = { - {RPMTAG_PREFIXES, 0, 0, 1, LEN_AND_STR("prefix")}, - {RPMTAG_BUILDROOT, 0, 0, 0, LEN_AND_STR("buildroot")}, - {RPMTAG_BUILDARCHS, 0, 0, 0, LEN_AND_STR("buildarchitectures")}, -- {RPMTAG_BUILDARCHS, 0, 0, 0, LEN_AND_STR("buildarch")}, -+ {RPMTAG_BUILDARCHS, 0, 0, 1, LEN_AND_STR("buildarch")}, - {RPMTAG_BUILDCONFLICTS, 0, 0, 0, LEN_AND_STR("buildconflicts")}, - {RPMTAG_BUILDPREREQ, 0, 1, 0, LEN_AND_STR("buildprereq")}, - {RPMTAG_BUILDREQUIRES, 0, 0, 0, LEN_AND_STR("buildrequires")}, diff --git a/rpm.spec b/rpm.spec index 700afea..43da115 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ %global rpmver 4.14.90 %global snapver git14653 -%global rel 15 +%global rel 16 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -49,8 +49,6 @@ Patch3: rpm-4.9.90-no-man-dirs.patch Patch5: rpm-4.12.0-rpm2cpio-hack.patch # https://github.com/rpm-software-management/rpm/pull/473 Patch6: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch -# Temporarily re-enable buildarch macro in specs for python_provide macro use -Patch7: rpm-4.14.90-enable-buildarch-macro.patch # Patches already upstream: # https://github.com/rpm-software-management/rpm/commit/526641ceeca12fbaa878401f8e65d17f240a9ae5 @@ -544,6 +542,9 @@ make check || (cat tests/rpmtests.log; exit 0) %doc doc/librpm/html/* %changelog +* Wed Jun 19 2019 Panu Matilainen - 4.14.90-0.git14653.16 +- Drop buildarch again now that python_provide no longer needs it (#1720139) + * Fri Jun 14 2019 Panu Matilainen - 4.14.90-0.git14653.15 - Temporarily re-enable buildarch macro for python_provide macro use (#1720139)