OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=13

noprovides.diff

@@ -17,7 +17,7 @@ for obsoleted packages. It's just too dangerous.
  	    mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, Name, 0);
  	else
 -	    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, Name, 0);
-+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, Name, 0);
++	    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, Name, 0);
  
  	xx = rpmdbPruneIterator(mi,
  	    ts->removedPackages, ts->numRemovedPackages, 1);

rpm-python.spec

@@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        107
+Release:        109
 Requires:       rpm = %{version}
 
 %py_requires

rpm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr 24 17:12:47 CEST 2007 - mls@suse.de
+
+- enable noprovides patch again.
+  disable part of the patch so that rpm checks the package provides
+  again instead of just package name when going through the
+  obsoletes list. This makes rpm behaviour consistent with the
+  updated libzypp. [#232127]
+
 -------------------------------------------------------------------
 Sun Apr 22 15:23:12 CEST 2007 - dmueller@suse.de
 

rpm.spec

@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq popt = %{popt_version} permission
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        100
+Release:        103
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -187,7 +187,7 @@ rm -f rpmdb/db.h
 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
-%patch -P 60       -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
+%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
 %patch -P 90 -P 91 -P 92 -P 93 -P 94
@@ -321,7 +321,7 @@ Summary:        A C library for parsing command line parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        328
+Release:        331
 #
 
 %description -n popt
@@ -344,7 +344,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        328
+Release:        331
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -380,6 +380,12 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Tue Apr 24 2007 - mls@suse.de
+- enable noprovides patch again.
+  disable part of the patch so that rpm checks the package provides
+  again instead of just package name when going through the
+  obsoletes list. This makes rpm behaviour consistent with the
+  updated libzypp. [#232127]
 * Sun Apr 22 2007 - dmueller@suse.de
 - fix stripping of symbol table
 * Tue Apr 17 2007 - dmueller@suse.de