SOURCES (rpm-4_5): rpm-macros-th.patch - oops, revert to right form.

[pluto]

Author: pluto                        Date: Wed Nov 26 21:46:07 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- oops, revert to right form.

---- Files affected:
SOURCES:
   rpm-macros-th.patch (1.7.2.2 -> 1.7.2.3) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros-th.patch
diff -u SOURCES/rpm-macros-th.patch:1.7.2.2 SOURCES/rpm-macros-th.patch:1.7.2.3
--- SOURCES/rpm-macros-th.patch:1.7.2.2	Wed Nov 26 22:37:54 2008
+++ SOURCES/rpm-macros-th.patch	Wed Nov 26 22:46:01 2008
@@ -13,15 +13,12 @@
  #	rpmfind.
 --- 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}
--  
-+%optldflags	%{!?no_build_with_as_needed:-Wl,--as-needed} -Wl,-z,relro -Wl,-z,combreloc
+@@ -1482,6 +1482,8 @@
+ # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
+ 
+ %debugcflags	-O0 -g -Wall
++%optldflags	-Wl,--as-needed -Wl,-z,relro -Wl,-z,combreloc
 +%optcppflags	-D_FORTIFY_SOURCE=2
-+
- #------------------------------------------------------------------------
- # mimetype(...) configuration.
- #
+ 
+ # Warning: those macros are overwritten by macros.build,
+ #          left here for compatibility
================================================================

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