diff --git a/instobscheck.diff b/instobscheck.diff deleted file mode 100644 index d8cb9a0..0000000 --- a/instobscheck.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- lib/depends.c.orig 2012-04-18 14:46:10.000000000 +0000 -+++ lib/depends.c 2012-04-18 14:46:15.000000000 +0000 -@@ -355,6 +355,7 @@ static int rpmdbProvides(rpmts ts, depCa - rpmdbMatchIterator mi = NULL; - Header h = NULL; - int rc = 0; -+ int matchnvr = rpmdsTagN(dep) == RPMTAG_OBSOLETENAME; - - /* See if we already looked this up */ - if (depCacheGetEntry(dcache, DNEVR, &cachedrc, NULL, NULL)) { -@@ -368,7 +369,7 @@ static int rpmdbProvides(rpmts ts, depCa - * taking file state into account: replaced, wrong colored and - * not installed files can not satisfy a dependency. - */ -- if (Name[0] == '/') { -+ if (Name[0] == '/' && !matchnvr) { - mi = rpmtsPrunedIterator(ts, RPMDBI_BASENAMES, Name); - while ((h = rpmdbNextIterator(mi)) != NULL) { - int fs = RPMFILE_STATE_MISSING; -@@ -390,9 +391,16 @@ static int rpmdbProvides(rpmts ts, depCa - if (h == NULL) { - mi = rpmtsPrunedIterator(ts, RPMDBI_PROVIDENAME, Name); - while ((h = rpmdbNextIterator(mi)) != NULL) { -- if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) { -- rpmdsNotify(dep, "(db provides)", rc); -- break; -+ if (matchnvr) { -+ if (rpmdsNVRMatchesDep(h, dep , _rpmds_nopromote)) { -+ rpmdsNotify(dep, "(db provides)", rc); -+ break; -+ } -+ } else { -+ if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) { -+ rpmdsNotify(dep, "(db provides)", rc); -+ break; -+ } - } - } - rpmdbFreeIterator(mi); 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..31276c1 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