From 67fd2db9f5ef85833f5222ad208599539a3f8754 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Jun 14 2019 07:34:02 +0000 Subject: Reorg patches as per upstream status --- diff --git a/rpm.spec b/rpm.spec index bb869d1..24501c5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -49,13 +49,13 @@ 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 -# https://github.com/rpm-software-management/rpm/commit/526641ceeca12fbaa878401f8e65d17f240a9ae5 -Patch7: 0001-Only-permit-one-thread-at-a-time-in-addFileToTag.patch -# https://github.com/rpm-software-management/rpm/pull/745 -Patch8: 0001-build-Limit-copying-changelog-one-at-a-time.patch # Patches already upstream: -Patch100: 0001-Don-t-fail-build-trying-to-kill-a-non-existent-proce.patch +# https://github.com/rpm-software-management/rpm/commit/526641ceeca12fbaa878401f8e65d17f240a9ae5 +Patch100: 0001-Only-permit-one-thread-at-a-time-in-addFileToTag.patch +# https://github.com/rpm-software-management/rpm/pull/745 +Patch101: 0001-build-Limit-copying-changelog-one-at-a-time.patch +Patch102: 0001-Don-t-fail-build-trying-to-kill-a-non-existent-proce.patch # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch