[packages/rpm] - disable removing duplicate ldconfig invocations optimization http://rpm5.org/community/rpm-devel
baggins
baggins at pld-linux.org
Mon Sep 10 08:12:06 CEST 2012
commit b6aa06669d52acb5791a88eef2b8499391c5b44e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Sep 9 19:18:20 2012 +0200
- disable removing duplicate ldconfig invocations optimization
http://rpm5.org/community/rpm-devel/5380.html
rpm-disable-ldconfig-optimization.patch | 11 +++++++++++
rpm.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 728cc03..c09a321 100644
--- 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
diff --git a/rpm-disable-ldconfig-optimization.patch b/rpm-disable-ldconfig-optimization.patch
new file mode 100644
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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/50008644283b35f6d09b11d696b4293a60977d8d
More information about the pld-cvs-commit
mailing list