rpms/apt/devel apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch, NONE, 1.1 apt.spec, 1.46, 1.47

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754

Modified Files:
	apt.spec 
Added Files:
	apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch 
Log Message:
- Hackery to help (multilib) obsoletes (#353271)


apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch:

--- NEW FILE apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch ---
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index a3fb896..cd226ee 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -962,8 +962,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		    End->Type != pkgCache::Dep::Conflicts &&
 		    End->Type != pkgCache::Dep::Obsoletes))
 	       {
-		  // Try a little harder to fix protected packages..
-		  if ((Flags[I->ID] & Protected) == Protected)
+		  // Try a little harder for protected packages and obsoletes..
+		  if ((Flags[I->ID] & Protected) == Protected ||
+		      End->Type == pkgCache::Dep::Obsoletes)
 		  {
 		     if (DoUpgrade(Pkg) == true)
 		     {
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 70b392a..3d4574f 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -295,6 +295,13 @@ signed short pkgPolicy::GetPkgPriority(const pkgCache::PkgIterator &Pkg)
 	    Max = Prio;
       }      
    }
+
+   /* XXX HACK alert: give non-native packages slightly lower priority */
+   string CAS = _config->Find("RPM::CompatArchSuffix");
+   if (!CAS.empty() && 
+	string(Pkg.Name()).rfind(CAS) != string::npos) {
+        Max--;
+   }
    return Max;
 }
 									/*}}}*/
diff --git a/apt-pkg/rpm/rpmpackagedata.cc b/apt-pkg/rpm/rpmpackagedata.cc
index 7dbac3a..24060e2 100644
--- a/apt-pkg/rpm/rpmpackagedata.cc
+++ b/apt-pkg/rpm/rpmpackagedata.cc
@@ -42,6 +42,10 @@ RPMPackageData::RPMPackageData()
       PreferredArch = _config->Find(PA.c_str(), BaseArch.c_str());
       string CAS = MLBase + "::CompatArchSuffix";
       CompatArchSuffix = _config->Find(CAS.c_str(), ".32bit");
+
+      // Blech, export for easy use elsewhere .. for now 
+      _config->Set("RPM::PreferredArch", PreferredArch);
+      _config->Set("RPM::CompatArchSuffix", CompatArchSuffix);
    }
 
    // Populate priorities


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apt.spec	16 Nov 2007 10:18:40 -0000	1.46
+++ apt.spec	16 Nov 2007 10:23:04 -0000	1.47
@@ -6,7 +6,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15lorg3.93
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -36,6 +36,8 @@
 Patch0: apt-0.5.15lorg3.2-ppc.patch
 # band aid for mmap issues (#211254)
 Patch1: apt-0.5.15lorg3.x-cache-corruption.patch
+# multilib obsoletes hackery (#353271)
+Patch2: apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -120,6 +122,7 @@
 %setup -q
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
+%patch2 -p1 -b .obsoletes-hack
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -285,6 +288,11 @@
 
 
 %changelog
+* Fri Nov 16 2007 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-3
+- Hackery to help (multilib) obsoletes (#353271)
+- Drop termcap + libtermcap from rpmpriorities to avoid installing needlessly
+- Drop docbook-utils dependency and hackery, no longer needed
+
 * Thu Aug 23 2007 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-2
 - gah, need to buildrequire gawk now...