[rpm/f16: 5/6] Revert "Add RPM_LD_FLAGS to build environment (#728974)"

[Panu Matilainen]

commit 4fff596509bd2199f2c3d3e9441ef80e29c0f7b4
Author: Panu Matilainen <Panu Matilainen pmatilai at redhat.com>
Date:   Mon Aug 15 13:06:02 2011 +0300

    Revert "Add RPM_LD_FLAGS to build environment (#728974)"
    
    This reverts commit 5594634579e3d55fea36e5544212e21e66d1f80b temporarily
    to get a saner merge with rawhide..

 rpm-4.9.1.1-ld-flags.patch |   15 ---------------
 rpm.spec                   |    8 +-------
 2 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 8de91c0..0864776 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}3%{?dist}
+Release: %{?snapver:0.%{snapver}.}2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -47,8 +47,6 @@ Patch301: rpm-4.6.0-niagara.patch
 Patch302: rpm-4.7.1-geode-i686.patch
 # To be upstreamed after rawhide-testdrive (#641377)
 Patch303: rpm-4.9.0-debuginfo-allnames.patch
-# Probably to be upstreamed in slightly different form
-Patch304: rpm-4.9.1.1-ld-flags.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -215,7 +213,6 @@ packages on a system.
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 %patch303 -p1 -b .debuginfo-allnames
-%patch304 -p1 -b .ldflags
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -429,9 +426,6 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
-* Mon Aug 08 2011 Adam Jackson <ajax at redhat.com> 4.9.1-3
-- Add RPM_LD_FLAGS to build environment (#728974)
-
 * Tue Jul 19 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1-2
 - fix recursion of directories with trailing slash in file list (#722474)