From 7942f114e3688d0aaa5669a1b7aa1c72b4e80e246099ab595cac4bc890615664 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@suse.com>
Date: Thu, 26 Sep 2019 14:06:39 +0000
Subject: [PATCH] Accepting request 733026 from
home:tomdevries:branches:devel:gcc-gdb-librpm-2
- Use ldd /bin/rpm instead of ls /usr/%{_lib}/ to find librpm
OBS-URL: https://build.opensuse.org/request/show/733026
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=226
---
gdb.changes | 5 +++++
gdb.spec | 8 +++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gdb.changes b/gdb.changes
index 9e17c8c..3f10a9c 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep 22 05:54:09 UTC 2019 - Tom de Vries <tdevries@suse.com>
+
+- Use ldd /usr/bin/rpm instead of ls /usr/%{_lib}/ to find librpm
+
-------------------------------------------------------------------
Sat Sep 14 05:45:30 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
diff --git a/gdb.spec b/gdb.spec
index 2f7e54f..d84012b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -669,12 +669,10 @@ LDFLAGS="$LDFLAGS -L$PWD/processor-trace-%{libipt_version}-root%{_libdir}"
export CXXFLAGS="$CFLAGS"
-export LIBRPM=$(ls -1 /usr/%{_lib}/ \
- | grep '^librpm.so.[0-9][0-9]*$' \
- | sort -V -r \
- | head -n 1)
+export LIBRPM=$(ldd /bin/rpm \
+ | grep librpm.so \
+ | awk '{print $3}')
if [ "$LIBRPM" != "" ]; then
- export LIBRPM="/usr/%{_lib}/$LIBRPM"
[ -f "$LIBRPM" ]
else
export LIBRPM=no