- preserve also PATH

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

diff --git a/rpm-macros-th.patch b/rpm-macros-th.patch
index f654c3b84ab3fddc7531edf5d1b825ee67a17508..f3f4a0174c36a3ad91b78a42256f164c4119722d 100644 (file)
--- a/rpm-macros-th.patch
+++ b/rpm-macros-th.patch
@@ -1,6 +1,7 @@
---- rpm-5.0.3/macros.in        2008-03-27 19:38:53.797722786 +0200
-+++ rpm-4.4.9/macros.in        2008-04-04 23:06:29.374285032 +0300
-@@ -282,6 +282,9 @@
+diff -ur rpm-4.4.9.org/macros.in rpm-4.4.9/macros.in
+--- rpm-4.4.9.org/macros.in    2008-07-24 08:52:35.205363000 +0200
++++ rpm-4.4.9/macros.in        2008-07-24 09:01:00.351355186 +0200
+@@ -275,6 +275,9 @@
  #
  #%distribution
  
@@ -10,11 +11,15 @@
  #     Configurable distribution URL, same as DistURL: tag in a specfile.
  #     The URL will be used to supply reliable information to tools like
  #     rpmfind.
-@@ -1464,6 +1467,7 @@
+--- 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 -Wl,-z,relro -Wl,-z,-combreloc
+-%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