[packages/rpm] - removed unneeded patch

baggins baggins at pld-linux.org
Wed Sep 19 10:23:39 CEST 2012


commit d107eb9001041acccbfc72568baa3f685f6be313
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Sep 19 09:55:01 2012 +0200

    - removed unneeded patch

 rpm-disable-ldconfig-optimization.patch | 11 -----------
 rpm.spec                                |  2 --
 2 files changed, 13 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 3e10844..a85bab3 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -118,7 +118,6 @@ 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
 Patch43:	%{name}-fix--p-interpreter-and-empty-script.patch
 Patch44:	%{name}-db_buffer_small.patch
 Patch45:	%{name}-pattern_Release.patch
@@ -788,7 +787,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-#patch42 -p1
 %patch43 -p1
 %patch44 -p1
 %patch45 -p1
diff --git a/rpm-disable-ldconfig-optimization.patch b/rpm-disable-ldconfig-optimization.patch
deleted file mode 100644
index 1c5e1ed..0000000
--- a/rpm-disable-ldconfig-optimization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/9ee75c3ceffe0801422c36179ac774d3a40e4086



More information about the pld-cvs-commit mailing list