- fixed rpm-fix--p-interpreter-and-empty-script.patch patch, previous

  version caused random segfaults
- disable ldconfig optimization, doesn't hurt to run more ldconfigs and
  http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-September/023036.html

diff --git a/rpm-fix--p-interpreter-and-empty-script.patch b/rpm-fix--p-interpreter-and-empty-script.patch
index 8c2f2fc97ed932ae0fc7aa6bed4e88a66b666b23..709b4649d5490a3cd3d20ae48a726aec0221ad95 100644 (file)
--- a/rpm-fix--p-interpreter-and-empty-script.patch
+++ b/rpm-fix--p-interpreter-and-empty-script.patch
@@ -1,15 +1,12 @@
 --- rpm-5.4.10/lib/psm.c~      2012-09-10 07:58:10.220193941 +0200
 +++ rpm-5.4.10/lib/psm.c       2012-09-10 08:00:38.723522037 +0200
-@@ -1172,11 +1172,8 @@
+@@ -1172,8 +1172,7 @@
  
  assert(fi->h != NULL);
      She->tag = psm->scriptTag;
 -    if (!headerGet(fi->h, She, 0))
 -      goto exit;
--
-     Phe->tag = psm->progTag;
--    if (!headerGet(fi->h, Phe, 0))
-+    if (!headerGet(fi->h, She, 0) && !headerGet(fi->h, Phe, 0))
-       goto exit;
++    headerGet(fi->h, She, 0);
  
-     /* Coerce strings into header argv return. */
+     Phe->tag = psm->progTag;
+     if (!headerGet(fi->h, Phe, 0))

diff --git a/rpm.spec b/rpm.spec
index d3ea26f365d2a5cef3adfb620dca0e00fc8bc1e6..9ef1becb1c421dddb42243d99347d1ed16febb46 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.10
+Release:       0.11
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -801,7 +801,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-#%patch42 -p1
+%patch42 -p1
 %patch43 -p1
 
 %patch1000 -p1