[redhat-rpm-config/f18] redhat-config-*: Use + to append rather than %rename, to protect against

[Adam Jackson]

commit 9096ff27788a44155a57ed39a86af027d7b0a6c4
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed May 29 11:31:41 2013 -0400

    redhat-config-*: Use + to append rather than %rename, to protect against
    
      multiple -specs= ending up in the command line. (#892837)

 redhat-hardened-cc1    |    4 +---
 redhat-hardened-ld     |    8 ++------
 redhat-rpm-config.spec |    6 +++++-
 3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/redhat-hardened-cc1 b/redhat-hardened-cc1
index 4d1bf59..47b4792 100644
--- a/redhat-hardened-cc1
+++ b/redhat-hardened-cc1
@@ -1,4 +1,2 @@
-%rename cc1_options rh_cc1_options_old
-
 *cc1_options:
-%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}} %(rh_cc1_options_old)
++ %{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}
diff --git a/redhat-hardened-ld b/redhat-hardened-ld
index b26049c..4e407b3 100644
--- a/redhat-hardened-ld
+++ b/redhat-hardened-ld
@@ -1,9 +1,5 @@
-%rename self_spec rh_self_spec_old
-
 *self_spec:
-%{!shared:-pie} %(rh_self_spec_old)
-
-%rename link rh_link_old
++ %{!shared:-pie}
 
 *link:
--z now %(rh_link_old)
++ -z now
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index bf58062..7a40aee 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 37%{?dist}
+Release: 37.1%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -97,6 +97,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Wed May 29 2013 Adam Jackson <ajax at redhat.com> 9.1.0-37.1
+- redhat-config-*: Use + to append rather than %%rename, to protect against
+  multiple -specs= ending up in the command line. (#892837)
+
 * Fri Nov  9 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 9.1.0-37
 - Patch to fix spaces in java jar files
   https://bugzilla.redhat.com/show_bug.cgi?id=872737