- turn on auto-generated perl requirements (#58519, #58536, #58537).

Sanity.

CVS patchset: 5265
CVS date: 2002/01/23 00:58:47

2 files changed, 7 insertions, 4 deletions

diff --git a/autodeps/linux.prov b/autodeps/linux.prov
index d292a83fd..9e821782e 100644
--- a/autodeps/linux.prov
+++ b/autodeps/linux.prov
@@ -7,7 +7,6 @@ filelist=`sed "s/['\"]/\\\&/g"`
 
 solist=$(echo $filelist | grep "\\.so" | grep -v "^/lib/ld.so" | \
 	xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1)
-perllist=$(echo $filelist | grep '\.pm$')
 pythonlist=
 tcllist=
 
@@ -46,8 +45,8 @@ done | sort -u
 
 #
 # --- Perl modules.
-[ -x /usr/lib/rpm/perl.prov -a -n "$perllist" ] &&
-    echo $perllist | tr [:blank:] \\n | /usr/lib/rpm/perl.prov | sort -u
+[ -x /usr/lib/rpm/perl.prov ] &&
+    echo $filelist | tr [:blank:] \\n | grep '\.pm$' | /usr/lib/rpm/perl.prov | sort -u
 
 #
 # --- Python modules.
diff --git a/autodeps/linux.req b/autodeps/linux.req
index 2ec07a153..a1019bcca 100644
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -63,11 +63,15 @@ for f in $scriptlist; do
     interplist="$interplist $interp"
     case $interp in
     */perl)	perllist="$perllist $f" ;;
-    *)		[ "${f%.pm}" != "${f}" ] && perllist="$perllist $f" ;;
     esac
 done
 [ -n "$interplist" ] && { echo "$interplist" | tr '[:blank:]' \\n | sort -u ; }
 
+#
+# --- Find perl module files.
+for f in $filelist; do
+    [ -r $f -a "${f%.pm}" != "${f}" ] && perllist="$perllist $f"
+done
 
 #
 # --- Weak symbol versions (from glibc).