From 89073b2ad013f6b073eba64bb6d95fb8bb0408c3f0ec1fc40caa9414d03914a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 28 Aug 2012 13:39:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=217 --- obsoletesdeptag.diff | 11 +++++++++++ python3-rpm.spec | 1 - rpm-python.spec | 1 - rpm.spec | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 obsoletesdeptag.diff diff --git a/obsoletesdeptag.diff b/obsoletesdeptag.diff new file mode 100644 index 0000000..b8911b2 --- /dev/null +++ b/obsoletesdeptag.diff @@ -0,0 +1,11 @@ +--- ./lib/depends.c.orig 2012-08-28 13:38:20.000000000 +0000 ++++ ./lib/depends.c 2012-08-28 13:38:31.000000000 +0000 +@@ -455,7 +455,7 @@ static int rpmdbProvides(rpmts ts, depCa + mi = rpmtsPrunedIterator(ts, dbtag, Name, prune); + while ((h = rpmdbNextIterator(mi)) != NULL) { + int match; +- if (dbtag == RPMDBI_OBSOLETENAME) { ++ if (deptag == RPMDBI_OBSOLETENAME) { + match = rpmdsNVRMatchesDep(h, dep, _rpmds_nopromote); + } else { + match = rpmdsMatchesDep(h, rpmdbGetIteratorFileNum(mi), dep, diff --git a/python3-rpm.spec b/python3-rpm.spec index 5b826aa..25367fd 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index c53c2eb..b1125b1 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm-python Version: 4.10.0 Release: 0 diff --git a/rpm.spec b/rpm.spec index 970e951..f80f1f9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm BuildRequires: binutils BuildRequires: bzip2 @@ -132,6 +131,7 @@ Patch76: python3-abi-kind.diff Patch77: langnoc.diff Patch78: headerchk2.diff Patch79: helperenv.diff +Patch80: obsoletesdeptag.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -204,6 +204,7 @@ rm -f rpmdb/db.h %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 +%patch -P 80 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov