diff --git a/rpm-4.4.2-teCount-assert.patch b/rpm-4.4.2-teCount-assert.patch new file mode 100644 index 0000000..643f104 --- /dev/null +++ b/rpm-4.4.2-teCount-assert.patch @@ -0,0 +1,16 @@ +--- rpm-4.4.2/lib/rpmte.c.hack 2006-05-03 16:06:24.000000000 -0400 ++++ rpm-4.4.2/lib/rpmte.c 2006-05-03 16:07:42.000000000 -0400 +@@ -586,9 +586,10 @@ + if (mydt != deptype) + /*@innercontinue@*/ continue; + ix &= 0x00ffffff; +-assert (ix < Count); +- colors[ix] |= val; +- refs[ix]++; ++ if (i < Count) { ++ colors[ix] |= val; ++ refs[ix]++; ++ } + } + } + diff --git a/rpm.spec b/rpm.spec index 95d12bb..da9a7eb 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,7 +20,7 @@ Name: rpm %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 21 +Release: 22 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -51,6 +51,7 @@ Patch22: rpm-4.4.2-vercmp.patch Patch23: rpm-4.4.2-doxy.patch Patch24: rpm-4.4.2-trust.patch Patch25: rpm-4.4.2-devel-autodep.patch +Patch26: rpm-4.4.2-teCount-assert.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -186,6 +187,7 @@ shell-like rules. %patch23 -p1 -b .doxy %patch24 -p1 -b .trust %patch25 -p1 -b .develdeps +%patch26 -p1 -b .assertte %build @@ -579,6 +581,10 @@ exit 0 %{__includedir}/popt.h %changelog +* Wed May 3 2006 Jeremy Katz - 4.4.2-22 +- put in simple workaround for per-file deps with autoreq off (#190488) + while pnasrat works on a real fix + * Fri Apr 28 2006 Jeremy Katz - 4.4.2-21 - run ldconfig in -libs subpackage %%post, not main package - add patch to generate shared lib deps by following symlinks so that