aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGötz Waschk <waschk@mandriva.org>2007-02-19 14:15:29 +0000
committerGötz Waschk <waschk@mandriva.org>2007-02-19 14:15:29 +0000
commit34616e1d9d75c2d3ab0bd919d2087d59af633171 (patch)
treef7c2220085de6f83f7adf7984b03999c7fdbcd98
parentad9ee3970bf164e847b7ccfe7e73526210da4070 (diff)
downloadrpm-setup-1.37.tar
rpm-setup-1.37.tar.gz
rpm-setup-1.37.tar.bz2
rpm-setup-1.37.tar.xz
rpm-setup-1.37.zip
filter out devel(ld-linux) if using objdump too1.37
-rw-r--r--configure.ac2
-rwxr-xr-xfind-requires.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 3166c5e..bce1b20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.36, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.37, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
diff --git a/find-requires.in b/find-requires.in
index 1c5a23e..c88af2e 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -221,7 +221,8 @@ for i in `echo $filelist | tr '[:blank:]' "\n" | egrep "(/usr(/X11R6)?)?/lib(|64
| grep -v "/\(lib\|lib64\)/\(ld\|ld64\|ld-linux.*\)\.so" \
| perl -p -e "s/\s+(\S+)\.so.*/devel(\1$lib64)/g"
else
- objdump -p $i | awk 'BEGIN { START=0; }
+ objdump -p $i | grep -v "\(ld\|ld64\|ld-linux.*\)\.so" \
+ | awk 'BEGIN { START=0; }
/^$/ { START=0; }
/^Dynamic Section:$/ { START=1; }
(START==1) && /NEEDED/ {