Sophie

Sophie

distrib > Mageia > 7 > x86_64 > by-pkgid > 133738fd1ec1a496d35c2af5039a0eb4 > files > 8

apt-0.5.15lorg3.94-32.mga7.src.rpm

diff -up apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc.usrmove_broken_rpm apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc
--- apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc.usrmove_broken_rpm	2013-01-26 17:20:19.119969272 +0100
+++ apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmhandler.cc	2013-01-26 17:27:38.431968419 +0100
@@ -156,7 +156,13 @@ bool RPMHandler::InternalDep(const char
      rpmds ds = rpmdsSingle(RPMTAG_PROVIDENAME,
 			    name, ver?ver:NULL, flag);
      rpmdsRpmlib(&rpmlibProv, NULL);
-     int res = rpmdsSearch(rpmlibProv, ds) >= 0;
+     /* now ignore the stupid /usr move related RPM hack */
+     rpmds ds_usrmovehack = rpmdsSingle(RPMTAG_PROVIDENAME, "rpmlib(X-CheckUnifiedSystemdir)",
+                                "0-0", RPMSENSE_EQUAL);
+     int res = rpmdsMerge(&rpmlibProv, ds_usrmovehack);
+     rpmdsFree(ds_usrmovehack);
+
+     res = rpmdsSearch(rpmlibProv, ds) >= 0;
      rpmdsFree(ds);
      rpmdsFree(rpmlibProv);
 #else