- disable removing duplicate ldconfig invocations optimization

  http://rpm5.org/community/rpm-devel/5380.html

diff --git a/rpm-disable-ldconfig-optimization.patch b/rpm-disable-ldconfig-optimization.patch
new file mode 100644 (file)
index 0000000..1c5e1ed
--- /dev/null
+++ b/rpm-disable-ldconfig-optimization.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/lib/psm.c~      2012-09-08 23:56:50.377390394 +0200
++++ rpm-5.4.10/lib/psm.c       2012-09-09 19:16:54.974129936 +0200
+@@ -754,7 +754,7 @@
+ static int ldconfig_done = 0;
+ 
+ /*@unchecked@*/ /*@observer@*/ /*@null@*/
+-static const char * ldconfig_path = "/sbin/ldconfig";
++static const char * ldconfig_path = NULL;
+ 
+ /**
+  * Run scriptlet with args.

diff --git a/rpm.spec b/rpm.spec
index 728cc0376f3e216254a8f46431727fe6a93fd8b1..c09a32198c55028183c04abc55eabf8b63185204 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       0.9
+Release:       0.10
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -132,6 +132,7 @@ Patch38:    %{name}-popt-coreutils.patch
 Patch39:       %{name}-postun-nofail.patch
 Patch40:       %{name}-silence-RPM_CHAR_TYPE.patch
 Patch41:       %{name}-fix-missing-types-in-headers.patch
+Patch42:       %{name}-disable-ldconfig-optimization.patch
 
 # Patches imported from Mandriva
 
@@ -797,6 +798,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 
 %patch1000 -p1
 %patch1001 -p1