- release 66: changed find-requires to allow _noautoreq for all autoreq classes

  (better to /test first...)

Changed files:
    rpm-find-requires -> 1.7
    rpm.spec -> 1.311

diff --git a/rpm-find-requires b/rpm-find-requires
index 584a0113e9cddf970ac3c14996864544e2625c10..5e3c8db9d1d875640e6f04ae1880846f09600fe5 100755 (executable)
--- a/rpm-find-requires
+++ b/rpm-find-requires
@@ -48,13 +48,14 @@ elflibrequires=`for f in $elfliblist; do
 done | sed "s/['\"]/\\\&/g" | grep -v 'libNoVersion.so' | sort -u
 `
 
-for f in $scriptlist; do
+scriptrequires=`for f in $scriptlist; do
     if [ -x $f ]; then
        head -1 $f | sed -ne '/^\#\!/p' | sed -e 's/^\#\![      ]*//' | cut -d" " -f1
     fi
 done | sort -u
+`
 
-for f in $liblist $exelist ; do
+elflibverrequires=`for f in $liblist $exelist ; do
     objdump -p $f | awk '
        BEGIN { START=0; LIBNAME=""; }
        /Version References:/ { START=1; }
@@ -66,12 +67,15 @@ for f in $liblist $exelist ; do
        /^$/ { START=0; }
     '
 done | sort -u
+`
 # Generate name of rpm package provides library
 
 allrequires="$aoutexerequires
 $elfexerequires
 $aoutlibrequires
-$elflibrequires"
+$elflibrequires
+$scriptrequires
+$elflibverrequires"
 
 if [ -f __rpm_noautoreq ] ; then
        for i in `cat __rpm_noautoreq`; do

diff --git a/rpm.spec b/rpm.spec
index e3d7ba107a4952563e3413f5ac4057b9529272f1..cd28b6800765a8ea00ca07fcb56d0b4b04b4cbbc 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -7,7 +7,7 @@ Summary(pl):    Aplikacja do zarz
 Summary(pt_BR):        Gerenciador de pacotes RPM
 Name:          rpm
 Version:       4.0.2
-Release:       65
+Release:       66
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz