[rpm/f16] warn but dont fail the build if STABS encountered by debugedit (#725378, Panu Matilainen)

[Karsten Hopp]

commit 4efb0e5b07ad5de006065aff0d30d6571f1557e1
Author: Karsten Hopp <karsten at redhat.com>
Date:   Thu Dec 15 16:56:04 2011 +0100

    warn but dont fail the build if STABS encountered by debugedit
    (#725378, Panu Matilainen)

 rpm-4.9.x-debugedit-stabs-warn.patch |   13 +++++++++++++
 rpm.spec                             |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/rpm-4.9.x-debugedit-stabs-warn.patch b/rpm-4.9.x-debugedit-stabs-warn.patch
new file mode 100644
index 0000000..c4eba81
--- /dev/null
+++ b/rpm-4.9.x-debugedit-stabs-warn.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/debugedit.c b/tools/debugedit.c
+index 89d0428..dc424d3 100644
+--- a/tools/debugedit.c
++++ b/tools/debugedit.c
+@@ -1586,7 +1586,7 @@ main (int argc, char *argv[])
+ 	  if (strcmp (name, ".stab") == 0)
+ 	    {
+ 	      fprintf (stderr, "Stabs debuginfo not supported: %s\n", file);
+-	      exit (1);
++	      break;
+ 	    }
+ 	  if (strcmp (name, ".debug_info") == 0)
+ 	    edit_dwarf2 (dso);
diff --git a/rpm.spec b/rpm.spec
index 1d48b65..6e28d6c 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}.}2%{?dist}
+Release: %{?snapver:0.%{snapver}.}3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -40,6 +40,8 @@ Patch3: rpm-4.8.0-no-man-dirs.patch
 Patch4: rpm-4.8.1-use-gpg2.patch
 #conditionally applied patch for arm hardware floating point
 Patch5: rpm-4.9.0-armhfp.patch
+#apply patch for PPC stubs
+Patch6: rpm-4.9.x-debugedit-stabs-warn.patch
 
 # Patches already in upstream
 
@@ -221,6 +223,8 @@ packages on a system.
 %patch5 -p1 -b .armhfp
 %endif
 
+%patch6 -p1 -b .stubs_warn
+
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
 %endif
@@ -433,6 +437,11 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Thu Dec 15 2011 Karsten Hopp <karsten at redhat.com> 4.9.1.2-.3
+- warn but dont fail the build if STABS encountered by debugedit 
+  (#725378, Panu Matilainen)
+
+
 * Tue Nov 30 2011 Dennis Gilmore <dennis at ausil.us> - 4.9.1.2-2
 - conditionally apply arm patch for hardfp on all arches but arm softfp ones