From 5568cb1c386d44307a837159e85953ceafe7fc34 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Apr 08 2015 13:29:03 +0000
Subject: Fix ld specs mishandling of incremental linking


---

diff --git a/redhat-hardened-ld b/redhat-hardened-ld
index 4e407b3..5825256 100644
--- a/redhat-hardened-ld
+++ b/redhat-hardened-ld
@@ -1,5 +1,5 @@
 *self_spec:
-+ %{!shared:-pie}
++ %{!shared:%{!r:-pie}}
 
 *link:
 + -z now
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 87581fe..17e2c49 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 28
+Version: 29
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -135,6 +135,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Wed Apr 08 2015 Adam Jackson <ajax@redhat.com> 29-1
+- Fix ld specs mishandling of incremental linking
+
 * Thu Feb 19 2015 Till Maas <opensource@till.name> - 28-1
 - Enable harden flags by default (#1192183)