rpms/apt/devel apt-0.5.15lorg3.95.git416-distroverpkg.patch, NONE, 1.1 apt.spec, 1.60, 1.61 rpmpriorities, 1.7, 1.8

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29185

Modified Files:
	apt.spec rpmpriorities 
Added Files:
	apt-0.5.15lorg3.95.git416-distroverpkg.patch 
Log Message:
- trim down ancient cruft in rpmpriorities (#444287)
- depend on system-release instead of fedora-release (#474911)
- look into provides when looking for DistroVerPkg


apt-0.5.15lorg3.95.git416-distroverpkg.patch:

--- NEW FILE apt-0.5.15lorg3.95.git416-distroverpkg.patch ---
commit 06f5fdb6e1ca0e1605522bcf47e244876a389701
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Dec 31 12:41:38 2008 +0200

    Look into provides when searching distrover pkg (rhbz#474911)

diff --git a/apt-pkg/rpm/rpmhandler.cc b/apt-pkg/rpm/rpmhandler.cc
index d101d10..3d4342d 100644
--- a/apt-pkg/rpm/rpmhandler.cc
+++ b/apt-pkg/rpm/rpmhandler.cc
@@ -905,11 +905,12 @@ bool RPMDBHandler::Jump(off_t Offset)
    return true;
 }
 
-bool RPMDBHandler::JumpByName(string PkgName)
+bool RPMDBHandler::JumpByName(string PkgName, bool Provides)
 {
+   raptTag tag = (raptTag)(Provides ? RPMTAG_PROVIDES : RPMDBI_LABEL);
    if (RpmIter == NULL) return false;
    rpmdbFreeIterator(RpmIter);
-   RpmIter = raptInitIterator(Handler, RPMDBI_LABEL, PkgName.c_str(), 0);
+   RpmIter = raptInitIterator(Handler, tag, PkgName.c_str(), 0);
    HeaderP = rpmdbNextIterator(RpmIter);
    return (HeaderP != NULL);
 }
diff --git a/apt-pkg/rpm/rpmhandler.h b/apt-pkg/rpm/rpmhandler.h
index 3d3fc3d..6c7c372 100644
--- a/apt-pkg/rpm/rpmhandler.h
+++ b/apt-pkg/rpm/rpmhandler.h
@@ -233,7 +233,7 @@ class RPMDBHandler : public RPMHdrHandler
    virtual bool OrderedOffset() {return false;}
 
    // used by rpmSystem::DistroVer()
-   bool JumpByName(string PkgName);
+   bool JumpByName(string PkgName, bool Provides=false);
 
    RPMDBHandler(bool WriteLock=false);
    virtual ~RPMDBHandler();
diff --git a/apt-pkg/rpm/rpmsystem.cc b/apt-pkg/rpm/rpmsystem.cc
index 47ba1e1..f8245d4 100644
--- a/apt-pkg/rpm/rpmsystem.cc
+++ b/apt-pkg/rpm/rpmsystem.cc
@@ -210,7 +210,7 @@ string rpmSystem::DistroVer()
       return "";
 
    string DistroVersion = "";
-   if (RpmDB->JumpByName(DistroVerPkg) == true) {
+   if (RpmDB->JumpByName(DistroVerPkg, true) == true) {
       DistroVersion = RpmDB->Version();
    } else {
       _error->Error(_("Unable to determine version for package %s"),


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apt.spec	31 Dec 2008 09:11:59 -0000	1.60
+++ apt.spec	31 Dec 2008 10:57:00 -0000	1.61
@@ -10,7 +10,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: %{aptver}
-Release: 0.%{snapver}.2%{?dist}
+Release: 0.%{snapver}.3%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -43,6 +43,7 @@
 
 # Patches already upstream
 Patch100: apt-0.5.15lorg3.95.git416-cronjob.patch
+Patch101: apt-0.5.15lorg3.95.git416-distroverpkg.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -69,7 +70,7 @@
 BuildRequires: autoconf, automake
 Requires: gnupg
 Requires: bzip2
-Requires: fedora-release >= 4
+Requires: system-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
@@ -131,6 +132,7 @@
 %patch1 -p0 -b .mmap
 
 %patch100 -p1 -b .cronjob
+%patch101 -p1 -b .distroverpkg
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -297,6 +299,11 @@
 
 
 %changelog
+* Wed Dec 31 2008 Panu Matilainen <pmatilai at redhat.com> - 0.5.15lorg3.95-0.git416.3
+- trim down ancient cruft in rpmpriorities (#444287)
+- depend on system-release instead of fedora-release (#474911)
+- look into provides when looking for DistroVerPkg
+
 * Wed Dec 31 2008 Panu Matilainen <pmatilai at redhat.com> - 0.5.15lorg3.95-0.git416.2
 - dont enable update "service" by default (#445096)
 


Index: rpmpriorities
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/rpmpriorities,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmpriorities	11 Jan 2008 20:50:40 -0000	1.7
+++ rpmpriorities	31 Dec 2008 10:57:00 -0000	1.8
@@ -1,35 +1,22 @@
 Essential:
   grub
-  ed
-  kbd
-  iproute
   libgcc
-  setserial
-  file
   rpm
   rsyslog
-  losetup
-  kudzu
   glibc
   shadow-utils
   coreutils
   bash
-  iputils
   vim-minimal
   passwd
-  cpio
-  raidtools
-  sysvinit
-  authconfig
-  hdparm
-  hotplug
-  readline
   util-linux-ng
   basesystem
   setup
   e2fsprogs
+  pam
   procps
   initscripts
   filesystem
-  fedora-release
+  system-release
   udev
+  upstart