[redhat-rpm-config] - revert back to plain -g, -g3 seems to cancel dwz size improvements

[Panu Matilainen]

commit 7f5c2c39435e8e6b2a797dbe15387fd4a532c632
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Mon Jun 25 17:22:09 2012 +0300

    - revert back to plain -g, -g3 seems to cancel dwz size improvements

 redhat-rpm-config-9.1.0-dwz.patch |   11 -----------
 redhat-rpm-config.spec            |    5 ++++-
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-dwz.patch b/redhat-rpm-config-9.1.0-dwz.patch
index b54162f..aa60c91 100644
--- a/redhat-rpm-config-9.1.0-dwz.patch
+++ b/redhat-rpm-config-9.1.0-dwz.patch
@@ -40,14 +40,3 @@
 +%_find_debuginfo_dwz_opts --run-dwz\\\
 +   --dwz-low-mem-die-limit %{_dwz_limit _dwz_low_mem_die_limit}\\\
 +   --dwz-max-die-limit %{_dwz_limit _dwz_max_die_limit}
---- redhat-rpm-config-9.1.0/macros.jj	2012-06-25 13:08:44.854489913 +0200
-+++ redhat-rpm-config-9.1.0/macros	2012-06-25 13:03:55.520112180 +0200
-@@ -191,7 +191,7 @@ unset DISPLAY\
- %_hardened_cflags	%{?_hardened_build:%{_hardening_cflags}}
- %_hardened_ldflags	%{?_hardened_build:%{_hardening_ldflags}}
- 
--%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 %{_hardened_cflags}
-+%__global_cflags	-O2 -g3 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 %{_hardened_cflags}
- %__global_ldflags	-Wl,-z,relro %{_hardened_ldflags}
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 711e797..23fc2d9 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: 30%{?dist}
+Release: 31%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Mon Jun 25 2012 Panu Matilainen <pmatilai at redhat.com> - 9.1.0-31
+- revert back to plain -g, -g3 seems to cancel dwz size improvements
+
 * Mon Jun 25 2012 Panu Matilainen <pmatilai at redhat.com> - 9.1.0-30
 - require dwz, enable dwarf compression for debuginfo packages (#833311)