From 7e5ea5f86723d6e9e3c0582d3d65342a3f6b0ddb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 27 Jul 2012 17:38:33 +0000
Subject: drop useless rpm5 bits (less divergence with upstream)

---
 NEWS              |  2 ++
 find-debuginfo.sh | 11 ++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 64fb4b0..4873deb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 - fix typo that breaks emiting maven provides
 - generate a perlapi-<version> provide when libperl.so is found
   (inspirated from mdv (pok))
+- sync find-debuginfo.sh with upstream rpm.org:
+  o drop useless rpm5 bits (less divergence with upstream)
 - kill unused find-provides.perl.in
 
 Version 1.151 - 26 Jul 2012, by Thierry Vignaud
diff --git a/find-debuginfo.sh b/find-debuginfo.sh
index f9861ac..8390b14 100755
--- a/find-debuginfo.sh
+++ b/find-debuginfo.sh
@@ -22,14 +22,6 @@
 # All file names in switches are relative to builddir (. if not given).
 #
 
-debugedit=/usr/lib/rpm/debugedit
-if [ ! -x $debugedit ]; then
-    # rpm5 since 5.2 has moved these binaries to a separate 'bin' subdirectory
-    if [ -x /usr/lib/rpm/bin/debugedit ]; then
-	debugedit=/usr/lib/rpm/bin/debugedit
-    fi
-fi
-
 # With -g arg, pass it to strip on libraries.
 strip_g=false
 
@@ -219,7 +211,8 @@ while read nlinks inum f; do
   fi
 
   echo "extracting debug info from $f"
-  id=$($debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \
+
+  id=$(/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \
 			      -i -l "$SOURCEFILE" "$f") || exit
   if [ -z "$id" ]; then
     echo >&2 "*** ${strict_error}: No build ID note found in $f"
-- 
cgit v1.2.1