drop ruby macros here, duplicate. provided by rpm-build-macros

[packages/rpm.git] / rpm-fix--p-interpreter-and-empty-script.patch

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))