From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 7 May 2013 17:47:21 +0000 (+0000)
Subject: - merge cflags and ldflags macros from PLD Th
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=1d8afbed1150da63a29365d8e5b1d0c64cb4f931;p=packages%2Frpm.git

- merge cflags and ldflags macros from PLD Th
---

diff --git a/rpm-macros-ti.patch b/rpm-macros-ti.patch
index cb94949..dbe7d01 100644
--- 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 21b6ed9..881443c 100644
--- 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