- added helperEVR-noassert patch (replace assert by error message;

[packages/rpm.git] / rpm-macros-th.patch

diff --git a/rpm-macros-th.patch b/rpm-macros-th.patch
index 8b0ba9f134b2748bf405b0af1dc414e5576dc2e9..726a7b8ac9a5141a4b80a4e6151240c43daa8b45 100644 (file)
--- a/rpm-macros-th.patch
+++ b/rpm-macros-th.patch
@@ -1,12 +1,24 @@
---- rpm-4.4.9/macros.in~       2008-03-27 19:29:07.000000000 +0200
-+++ rpm-4.4.9/macros.in        2008-03-27 19:29:30.110775332 +0200
-@@ -1457,6 +1457,9 @@
- # PLD rpm macros
- %_enable_debug_packages 1
+--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget  2010-05-30 17:11:07.699227892 +0200
++++ rpm-5.3.1/macros/macros.rpmbuild.in        2010-05-30 17:12:37.700048249 +0200
+@@ -102,6 +102,9 @@
+ #
+ #%distribution
  
 +# PLD Linux Release
 +%pld_release    th
 +
- #-----------------------------------------------------------------
- # CFLAGS and LDFLAGS used to build
+ #     Configurable bug URL, same as BugURL: tag in a specfile.
+ #     The URL will be used to supply reliable information to where
+ #     to file bugs.
+--- rpm-5.3.1/macros/macros.in.wiget   2010-05-30 17:10:50.702560935 +0200
++++ rpm-5.3.1/macros/macros.in 2010-05-30 17:10:50.705892723 +0200
+@@ -956,7 +956,8 @@ pakietu oraz przy odpluskwianiu samego p
+ # -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,
+ #          left here for compatibility