[libguestfs] libguestfs-find-requires: Be more specific about regexps matching library paths.

[Richard W.M. Jones]

commit 82faf4e03a43a5fb2a59d9b65dbd288bccde0b95
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Aug 2 20:18:58 2012 +0100

    libguestfs-find-requires: Be more specific about regexps matching library paths.
    
    In particular, don't match and convert filenames such as
    "/lib64/rtkaio/librt.so.1" but dump those out directly as
    dependencies (there is only one such file dependency in Rawhide).

 libguestfs-find-requires.sh |   10 ++++++----
 libguestfs.spec             |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/libguestfs-find-requires.sh b/libguestfs-find-requires.sh
index 595df2f..252d581 100755
--- a/libguestfs-find-requires.sh
+++ b/libguestfs-find-requires.sh
@@ -28,10 +28,12 @@ fi
 sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*'`
 for f in $sofiles; do
     if [ -f "$f" ]; then
-        if [[ "$f" =~ /lib64/(.*) ]]; then
-            echo "${BASH_REMATCH[1]}()(64bit)"
-        elif [[ "$f" =~ /lib/(.*) ]]; then
-            echo "${BASH_REMATCH[1]}"
+        if [[ "$f" =~ (/usr)?/lib64/([^/]*)$ ]]; then
+            echo "${BASH_REMATCH[2]}()(64bit)"
+        elif [[ "$f" =~ (/usr)?/lib/([^/]*)$ ]]; then
+            echo "${BASH_REMATCH[2]}"
+        else
+            echo "$f"
         fi
     fi
 done
diff --git a/libguestfs.spec b/libguestfs.spec
index c0acab3..3579a31 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.28
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -997,7 +997,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
-* Thu Aug 02 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.28-2
+* Thu Aug 02 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.28-3
 - New upstream version 1.19.28.
 - Update libguestfs-find-requires to generate ordinary lib dependencies.