aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-05-10 09:19:54 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-05-10 09:19:54 +0000
commit5f21c24c28a338b83f9ebf8234f0d65b817b1dd8 (patch)
tree4cd944d6b8563668b7b945e8df10674caa73a983
parentbc4d39c4e47f4708b4a561adedb1522e474dd61b (diff)
downloadrpm-setup-5f21c24c28a338b83f9ebf8234f0d65b817b1dd8.tar
rpm-setup-5f21c24c28a338b83f9ebf8234f0d65b817b1dd8.tar.gz
rpm-setup-5f21c24c28a338b83f9ebf8234f0d65b817b1dd8.tar.bz2
rpm-setup-5f21c24c28a338b83f9ebf8234f0d65b817b1dd8.tar.xz
rpm-setup-5f21c24c28a338b83f9ebf8234f0d65b817b1dd8.zip
Revert recent changes to computation of provides/requires w.r.t .so files that
are not in standard paths.
-rwxr-xr-xfind-provides.in2
-rwxr-xr-xfind-requires.in6
2 files changed, 4 insertions, 4 deletions
diff --git a/find-provides.in b/find-provides.in
index 428896c..8f32dad 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -5,7 +5,7 @@
filelist=`sed "s/['\"]/\\\&/g"`
-solist=$(echo "$filelist" | grep -v "^/lib/ld\.so" | egrep '(/usr(/X11R6)?)?/lib(64)?/[^/]+\.so' | \
+solist=$(echo "$filelist" | grep -v "^/lib/ld\.so" | egrep '(/usr(/X11R6)?)?/lib(64)?/.*\.so' | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1)
pythonlist=
tcllist=
diff --git a/find-requires.in b/find-requires.in
index 0460efa..41369a0 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -9,7 +9,7 @@ ulimit -c 0
#
# --- Set needed to 0 for traditional find-requires behavior.
-needed=0
+needed=1
if [ X"$1" = Xldd ]; then
needed=0
elif [ X"$1" = Xobjdump ]; then
@@ -69,7 +69,7 @@ if [ "$needed" -eq 0 ]; then
lib64=`if file -L $f 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
ldd $f | awk '/=>/ {
- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) {
+ if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/) {
gsub(/'\''"/,"\\&",$1);
printf "%s'$lib64'\n", $1
}
@@ -83,7 +83,7 @@ if [ "$needed" -eq 0 ]; then
lib64=`if file -L $f 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
ldd $f | awk '/=>/ {
- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) {
+ if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/) {
gsub(/'\''"/,"\\&",$1);
printf "%s'$lib64'\n", $1
}