SOURCES: rpm-macros.patch - turn off executable() requirements - b...

[arekm]

Author: arekm                        Date: Tue Jan  9 22:56:02 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- turn off executable() requirements - broken in some cases

---- Files affected:
SOURCES:
   rpm-macros.patch (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.34 SOURCES/rpm-macros.patch:1.35
--- SOURCES/rpm-macros.patch:1.34	Sat Jan  6 21:10:12 2007
+++ SOURCES/rpm-macros.patch	Tue Jan  9 23:55:57 2007
@@ -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
-+++ 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
  
@@ -66,10 +66,13 @@
  
  #==============================================================================
  # ---- 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
- %__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
 +
@@ -87,7 +90,6 @@
 +%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags	%{rpmcflags}
 +%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed}
-+
+ 
  # \endverbatim
  #*/
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-macros.patch?r1=1.34&r2=1.35&f=u