- added ldconfig-always patch disabling strange checks if /sbin/ldconfig was

  already run (sometimes ldconfig was not run when necessary)
- release .20.10

Changed files:
    rpm-ldconfig-always.patch -> 1.1
    rpm.spec -> 1.466

diff --git a/rpm-ldconfig-always.patch b/rpm-ldconfig-always.patch
new file mode 100644 (file)
index 0000000..fbf86d4
--- /dev/null
+++ b/rpm-ldconfig-always.patch
@@ -0,0 +1,14 @@
+--- rpm-4.3/lib/psm.c.orig     2003-05-10 17:20:15.000000000 +0200
++++ rpm-4.3/lib/psm.c  2003-08-24 21:41:29.637316776 +0200
+@@ -550,7 +550,10 @@
+     xx = headerNVR(h, &n, &v, &r);
+ 
+     /* XXX bash must have functional libtermcap.so.2 */
+-    if (!strcmp(n, "libtermcap"))
++    /* if (!strcmp(n, "libtermcap"))
++     * -- always run ldconfig, these checks didn't work when few packages with
++     *    shared libs were installed just one after another in the same
++     *    transaction */
+       ldconfig_done = 0;
+ 
+     /*

diff --git a/rpm.spec b/rpm.spec
index e3b697976dcae6f2c783163cf7a5d6f58f5e2121..4ff38445786d588e6c92e81ee7e924a1423200d9 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Name:          rpm
 %define        ver     4.3
 Version:       %{ver}
-%define        rel     0.%{snap}.20.9
+%define        rel     0.%{snap}.20.10
 Release:       %{rel}
 License:       GPL
 Group:         Base
@@ -76,7 +76,7 @@ Patch16:      %{name}-etc_dir.patch
 Patch17:       %{name}-system_libs-more.patch
 Patch18:       %{name}-php-deps.patch
 Patch19:       %{name}-python-fix.patch
-
+Patch20:       %{name}-ldconfig-always.patch
 Patch21:       %{name}-perl_req.patch
 Patch22:       %{name}-system_libs_more.patch
 Patch23:       %{name}-python_2_3.patch
@@ -546,6 +546,7 @@ construir pacotes usando o RPM.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1