[rpmreaper] fix reading of package provides

Miroslav Lichvar mlichvar at fedoraproject.org
Mon Jan 31 16:37:01 UTC 2011


commit ce8bf1641ac6f5256f80ba033159361c22435157
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Mon Jan 31 17:36:40 2011 +0100

    fix reading of package provides

 rpmreaper-0.1.6-rpmdbiter.patch |   19 +++++++++++++++++++
 rpmreaper.spec                  |    5 ++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/rpmreaper-0.1.6-rpmdbiter.patch b/rpmreaper-0.1.6-rpmdbiter.patch
index 219506f..a2d55ce 100644
--- a/rpmreaper-0.1.6-rpmdbiter.patch
+++ b/rpmreaper-0.1.6-rpmdbiter.patch
@@ -17,3 +17,22 @@ index 405974f..8f20cde 100644
  	for (pid = firstpid; (header = rpmdbNextIterator(iter)) != NULL; pid++) {
  #ifdef _RPM_4_4_COMPAT
  		int i, ds1, ds2, ds3;
+commit 99455fd99fe541a15e6c7dcaab357fa89db038fb
+Author: Miroslav Lichvar <mlichvar at redhat.com>
+Date:   Mon Jan 31 17:31:48 2011 +0100
+
+    use RPMDBI_PACKAGES index also when reading provides
+
+diff --git a/rpm.c b/rpm.c
+index 8f20cde..230818b 100644
+--- a/rpm.c
++++ b/rpm.c
+@@ -192,7 +192,7 @@ static int rpm_read_provs(const struct repo *repo, struct pkgs *p, uint firstpid
+ 	dirs = rpmtdNew();
+ 	dirindexes = rpmtdNew();
+ #endif
+-	iter = rpmtsInitIterator(ts, RPMTAG_NAME, NULL, 0);
++	iter = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
+ 
+ 	for (pid = firstpid; (header = rpmdbNextIterator(iter)) != NULL; pid++) {
+ #ifdef _RPM_4_4_COMPAT
diff --git a/rpmreaper.spec b/rpmreaper.spec
index be34baa..d800dc2 100644
--- a/rpmreaper.spec
+++ b/rpmreaper.spec
@@ -1,6 +1,6 @@
 Name:           rpmreaper
 Version:        0.1.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A tool for removing packages from system
 
 Group:          Applications/System
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Jan 31 2011 Miroslav Lichvar <mlichvar at redhat.com> 0.1.6-6
+- fix reading of package provides
+
 * Fri Jan 21 2011 Miroslav Lichvar <mlichvar at redhat.com> 0.1.6-5
 - rebuild for new rpm
 - use RPMDBI_PACKAGES index when iterating rpmdb (#671149)


More information about the scm-commits mailing list