SOURCES (rpm-4_5): rpm-macros-th.patch - make it applicable.

[pluto]

Author: pluto                        Date: Wed Nov 26 21:15:53 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- make it applicable.

---- Files affected:
SOURCES:
   rpm-macros-th.patch (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros-th.patch
diff -u SOURCES/rpm-macros-th.patch:1.7 SOURCES/rpm-macros-th.patch:1.7.2.1
--- SOURCES/rpm-macros-th.patch:1.7	Fri Oct 24 22:10:13 2008
+++ SOURCES/rpm-macros-th.patch	Wed Nov 26 22:15:47 2008
@@ -11,15 +11,17 @@
  #	Configurable distribution URL, same as DistURL: tag in a specfile.
  #	The URL will be used to supply reliable information to tools like
  #	rpmfind.
---- rpm/macros.in~	2008-07-29 15:33:40.289757059 +0200
-+++ rpm/macros.in	2008-07-29 15:37:14.559735562 +0200
-@@ -1635,7 +1635,8 @@
- # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
- 
- %debugcflags	-O0 -g -Wall
--%optldflags	-Wl,--as-needed
-+%optldflags	-Wl,--as-needed -Wl,-z,relro -Wl,-z,combreloc
-+%optcppflags	-D_FORTIFY_SOURCE=2
- 
- # Warning: those macros are overwritten by macros.build,
+--- rpm-4.5/macros.in.orig	2008-11-26 21:59:11.346746301 +0100
++++ rpm-4.5/macros.in	2008-11-26 22:01:02.728818761 +0100
+@@ -1490,8 +1490,9 @@
  #          left here for compatibility
+ %rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
+ %rpmcxxflags	%{rpmcflags}
+-%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed}
+-  
++%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed} -Wl,-z,relro -Wl,-z,combreloc
++%optcppflags	-D_FORTIFY_SOURCE=2
++
+ #------------------------------------------------------------------------
+ # mimetype(...) configuration.
+ #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros-th.patch?r1=1.7&r2=1.7.2.1&f=u