From f65ecb87e0353894e686df586a42861a0c25a5c1b952f06e0db0f3f0d042f9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Mon, 14 Mar 2022 11:16:55 +0000
Subject: [PATCH] Accepting request 961661 from home:dirkmueller:Factory

- drop rpm-deptracking.patch, this is already upstream and
  we were just adding it twice

OBS-URL: https://build.opensuse.org/request/show/961661
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=601
---
 rpm-deptracking.patch | 12 ------------
 rpm.changes           |  6 ++++++
 rpm.spec              |  3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 rpm-deptracking.patch

diff --git a/rpm-deptracking.patch b/rpm-deptracking.patch
deleted file mode 100644
index 62b24c6..0000000
--- a/rpm-deptracking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./macros.in.orig	2017-12-01 15:50:47.587969729 +0000
-+++ ./macros.in	2017-12-01 15:50:53.813951691 +0000
-@@ -1039,7 +1039,8 @@ package or when debugging this package.\
- 	--localstatedir=%{_localstatedir} \\\
- 	--sharedstatedir=%{_sharedstatedir} \\\
- 	--mandir=%{_mandir} \\\
--	--infodir=%{_infodir}
-+	--infodir=%{_infodir} \\\
-+	--disable-dependency-tracking
- 
- #------------------------------------------------------------------------------
- # Tested features of make
diff --git a/rpm.changes b/rpm.changes
index 3377170..effd00d 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 14 10:50:39 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop rpm-deptracking.patch, this is already upstream and
+  we were just adding it twice 
+
 -------------------------------------------------------------------
 Tue Mar  8 19:31:27 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/rpm.spec b/rpm.spec
index d544b1e..484a95a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -100,7 +100,6 @@ Patch69:        nobuildcolor.diff
 Patch70:        fileattrs.diff
 Patch71:        nomagiccheck.diff
 Patch73:        assumeexec.diff
-Patch75:        rpm-deptracking.patch
 Patch77:        langnoc.diff
 Patch78:        headerchk2.diff
 Patch79:        leave-malloc-check-set.diff
@@ -242,7 +241,7 @@ rm -rf sqlite
 %patch                   -P 43       -P 45 -P 46 -P 47
 %patch       -P 51
 %patch -P 60 -P 61                         -P 66 -P 67       -P 69
-%patch -P 70 -P 71       -P 73       -P 75       -P 77 -P 78 -P 79
+%patch -P 70 -P 71       -P 73                   -P 77 -P 78 -P 79
 %patch                               -P 85
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100        -P 102 -P 103