[gdb-heap/f14/master] cherrypick fix for rhbz#638662

[dmalcolm]

commit 041be0244772337ec2d65d9326761564265943ae
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Wed Sep 29 17:33:26 2010 -0400

    cherrypick fix for rhbz#638662

 fix-rhbz638662.patch |   26 ++++++++++++++++++++++++++
 gdb-heap.spec        |    8 +++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/fix-rhbz638662.patch b/fix-rhbz638662.patch
new file mode 100644
index 0000000..2b172ef
--- /dev/null
+++ b/fix-rhbz638662.patch
@@ -0,0 +1,26 @@
+From 70e7228da13b61421fd27c2b18f429bdc4803e71 Mon Sep 17 00:00:00 2001
+From: David Malcolm <dmalcolm at redhat.com>
+Date: Wed, 29 Sep 2010 12:40:07 -0400
+Subject: [PATCH] Fix missing import
+
+---
+ heap/glibc.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/heap/glibc.py b/heap/glibc.py
+index 0c61643..4b340d2 100644
+--- a/heap/glibc.py
++++ b/heap/glibc.py
+@@ -27,7 +27,8 @@ import re
+ 
+ import gdb
+ 
+-from heap import WrappedPointer, WrappedValue, caching_lookup_type, type_char_ptr
++from heap import WrappedPointer, WrappedValue, caching_lookup_type, \
++    type_char_ptr, check_missing_debuginfo
+ 
+ class MChunkPtr(WrappedPointer):
+     '''Wrapper around glibc's mchunkptr
+-- 
+1.5.5.6
+
diff --git a/gdb-heap.spec b/gdb-heap.spec
index f2925ee..83611b2 100644
--- a/gdb-heap.spec
+++ b/gdb-heap.spec
@@ -7,7 +7,7 @@
 
 Name:           gdb-heap
 Version:        0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions to gdb for debugging dynamic memory allocation
 
 Group:          Development/Libraries
@@ -20,6 +20,8 @@ URL:            https://fedorahosted.org/gdb-heap/
 Source0:        https://fedorahosted.org/released/gdb-heap/gdb-heap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:         fix-rhbz638662.patch
+
 Requires:       python-ply
 
 BuildRequires:  python
@@ -52,6 +54,7 @@ dynamic memory allocation problems in user space.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # empty
@@ -86,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 29 2010 David Malcolm <dmalcolm at redhat.com> - 0.5-2
+- cherrypick fix for rhbz#638662
+
 * Thu Aug 12 2010 David Malcolm <dmalcolm at redhat.com> - 0.5-1
 - 0.5
 - add requirement on python-ply