Index: lib/depends.c
===================================================================
--- lib/depends.c
+++ lib/depends.c	2007-02-27 17:29:05.186080738 +0100
@@ -390,7 +390,7 @@
     /* On upgrade, erase older packages of same color (if any). */
 
   if (!(depFlags & RPMDEPS_FLAG_NOUPGRADE)) {
-    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0);
+    mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
     while((oh = rpmdbNextIterator(mi)) != NULL) {
 	int lastx;
 	rpmte q;
@@ -449,7 +449,7 @@
 	if (Name[0] == '/')
 	    mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, Name, 0);
 	else
-	    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, Name, 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, Name, 0);
 
 	xx = rpmdbPruneIterator(mi,
 	    ts->removedPackages, ts->numRemovedPackages, 1);
@@ -471,7 +471,7 @@
 	     * If no obsoletes version info is available, match all names.
 	     */
 	    if (!(rpmdsEVR(obsoletes) == NULL
-	     || rpmdsAnyMatchesDep(oh, obsoletes, _rpmds_nopromote)))
+	     || rpmdsNVRMatchesDep(oh, obsoletes, _rpmds_nopromote)))
 		/*@innercontinue@*/ continue;
 
 	    /* Create an erasure element. */