Hello community, here is the log from the commit of package rpm checked in at Thu Apr 26 19:02:19 CEST 2007. -------- --- rpm/rpm.changes 2007-04-22 15:30:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-04-24 17:13:47.876203000 +0200 @@ -1,0 +2,9 @@ +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] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.h10906/_old 2007-04-26 19:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.h10906/_new 2007-04-26 19:01:59.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 107 +Release: 109 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.h10906/_old 2007-04-26 19:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.h10906/_new 2007-04-26 19:01:59.000000000 +0200 @@ -20,7 +20,7 @@ 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 @@ %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 @@ 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 @@ 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 @@ %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 ++++++ noprovides.diff ++++++ --- /var/tmp/diff_new_pack.h10906/_old 2007-04-26 19:02:00.000000000 +0200 +++ /var/tmp/diff_new_pack.h10906/_new 2007-04-26 19:02:00.000000000 +0200 @@ -17,7 +17,7 @@ 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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de