[elfutils/f17: 2/2] Merge branch 'master' into f17

[Mark Wielaard]

commit 0b8d01b350b71a61e3079fc71f49196c0fd5f1ed
Merge: e33d975 3152a53
Author: Mark Wielaard <mjw at redhat.com>
Date:   Wed Jul 25 11:57:05 2012 +0200

    Merge branch 'master' into f17
    
    Use elfutils-0.154-xlatetom-835877.patch instead of workaround
    elfutils-0.154-nounstripcheck-835877.patch.

 elfutils-0.154-nounstripcheck-835877.patch |   42 ------------------------
 elfutils-0.154-xlatetom-835877.patch       |   48 ++++++++++++++++++++++++++++
 elfutils.spec                              |   11 +++---
 3 files changed, 54 insertions(+), 47 deletions(-)
---
diff --cc elfutils.spec
index 0314ebe,2161c98..2277236
--- a/elfutils.spec
+++ b/elfutils.spec
@@@ -331,8 -329,11 +329,11 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_libdir}/libelf.a
  
  %changelog
+ * Mon Jul 18 2012 Mark Wielaard <mjw at redhat.com> 0.154-2
+ - Add upstream xlatetom fix (#835877)
+ 
  * Mon Jul 02 2012 Karsten Hopp <karsten at redhat.com> 0.154-1.1
 -- disable unstrip-n check for now (835877)
 +- disable unstrip-n check for now on ppc* (835877)
  
  * Fri Jun 22 2012 Mark Wielaard <mjw at redhat.com> - 0.154-1
  - Update to 0.154