- merge cflags and ldflags macros from PLD Th

diff --git a/rpm-macros-ti.patch b/rpm-macros-ti.patch
index cb94949fe4a38a7a27cfe6219d041cec4683423f..dbe7d01ce4eb4538cc0f3444c4b650437197c729 100644 (file)
--- a/rpm-macros-ti.patch
+++ b/rpm-macros-ti.patch
@@ -29,12 +29,13 @@ diff -urN rpm-4.5/macros.in rpm-4.5.new//macros.in
  
  #------------------------------------------------------------------------
  # executable(...) configuration.
-@@ -1482,6 +1485,8 @@
+@@ -1482,6 +1485,9 @@
  # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
  
  %debugcflags  -O0 -g -Wall
-+%optldflags   -Wl,--as-needed
-+%optcppflags  %{nil}
++%debugcppflags        %{nil}
++%optldflags   -Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc
++%optcppflags  -D_FORTIFY_SOURCE=2
  
  # Warning: those macros are overwritten by macros.build,
  #          left here for compatibility

diff --git a/rpm.spec b/rpm.spec
index 21b6ed9a28755a00addc5b8b20d72b714f482512..881443c1d5a0ef68912f999cad6b4ce3a8a490dd 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -42,7 +42,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       70
+Release:       71
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz