- turn off executable() requirements - broken in some cases

Changed files:
    rpm-macros.patch -> 1.35

diff --git a/rpm-macros.patch b/rpm-macros.patch
index d10d3252c8087487116a8fe700dcb68d245262cd..11504487baf111fa37dfa5f1c5f107b64f225680 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,6 @@
 diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
 --- rpm-4.4.7.org/macros.in    2007-01-06 18:28:22.094067000 +0100
 diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
 --- rpm-4.4.7.org/macros.in    2007-01-06 18:28:22.094067000 +0100

-+++ rpm-4.4.7/macros.in        2007-01-06 21:09:28.566184000 +0100
++++ rpm-4.4.7/macros.in        2007-01-09 23:55:19.559199000 +0100

 @@ -217,10 +217,11 @@
  %_srcrpmdir           %{_topdir}/SRPMS
  
 @@ -217,10 +217,11 @@
  %_srcrpmdir           %{_topdir}/SRPMS
  


@@ -66,10 +66,13 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
  
  #==============================================================================
  # ---- config.guess platform macros.
  
  #==============================================================================
  # ---- config.guess platform macros.

-@@ -1371,5 +1372,23 @@
+@@ -1369,7 +1370,25 @@
+ # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
+ #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides

  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires

- %__scriptlet_requires /bin/bash --rpm-requires
- 
+-%__scriptlet_requires /bin/bash --rpm-requires
++#%__scriptlet_requires        /bin/bash --rpm-requires
++

 +# PLD rpm macros
 +%_enable_debug_packages 1
 +
 +# PLD rpm macros
 +%_enable_debug_packages 1
 +


@@ -87,7 +90,6 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
 +%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags  %{rpmcflags}
 +%rpmldflags   %{!?no_build_with_as_needed:-Wl,--as-needed}
 +%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags  %{rpmcflags}
 +%rpmldflags   %{!?no_build_with_as_needed:-Wl,--as-needed}

-+
+ 

  # \endverbatim
  #*/
  # \endverbatim
  #*/

-