From 63747f2774c0e20188ba065a043aa5bc2a2a26cb Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@fedoraproject.org>
Date: Mon, 1 Mar 2010 09:06:10 +0000
Subject: [PATCH] - avoid unnecessarily running brp-strip-comment-note
 (#568924)

---
 redhat-rpm-config-9.1.0-no-strip-note.patch | 27 +++++++++++++++++++++
 redhat-rpm-config.spec                      |  7 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 redhat-rpm-config-9.1.0-no-strip-note.patch

diff --git a/redhat-rpm-config-9.1.0-no-strip-note.patch b/redhat-rpm-config-9.1.0-no-strip-note.patch
new file mode 100644
index 0000000..bcb5bd0
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-no-strip-note.patch
@@ -0,0 +1,27 @@
+commit 055d0b77e1e2823daef60a4c2b201531dc0c7248
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date:   Mon Mar 1 10:58:17 2010 +0200
+
+    Don't run brp-strip-comment-note when find-debuginfo.sh is run (#568924)
+    - brp-strip-comment-note is not only unnecessary here but is also
+      now messing up things by resetting EI_OSABI to zero (#568921)
+    - patch from  Roland McGrath
+
+diff --git a/macros b/macros
+index 7721fe0..1ac46d7 100644
+--- a/macros
++++ b/macros
+@@ -92,9 +92,11 @@
+ 
+ %__os_install_post    \
+     /usr/lib/rpm/redhat/brp-compress \
+-    %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip}} \
+-    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
++    %{!?__debug_package:\
++    /usr/lib/rpm/redhat/brp-strip %{__strip} \
+     /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
++    } \
++    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
+     /usr/lib/rpm/brp-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build} \
+     /usr/lib/rpm/redhat/brp-python-hardlink \
+     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index bb2c6ce..f67cca6 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: 3%{?dist}
+Release: 4%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -9,6 +9,7 @@ URL: http://git.fedoraproject.org/git/redhat-rpm-config
 Source: redhat-rpm-config-%{version}.tar.bz2
 Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
 Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
+Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch
 BuildArch: noarch
 Requires: mktemp
 Requires: rpm >= 4.6.0
@@ -22,6 +23,7 @@ Red Hat specific rpm configuration files.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -41,6 +43,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Mon Mar 01 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-4
+- avoid unnecessarily running brp-strip-comment-note (#568924)
+
 * Mon Feb 15 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-3
 - unbreak find-requires again, doh (#564527)