- fix in find-requires - back to noautoreqdep for script interpreters

- release 67

Changed files:
    rpm-find-requires -> 1.8
    rpm.spec -> 1.312

diff --git a/rpm-find-requires b/rpm-find-requires
index 5e3c8db9d1d875640e6f04ae1880846f09600fe5..4f17454840d1d958c5e9d85d82d166847cc6c01b 100755 (executable)
--- a/rpm-find-requires
+++ b/rpm-find-requires
@@ -74,15 +74,18 @@ allrequires="$aoutexerequires
 $elfexerequires
 $aoutlibrequires
 $elflibrequires
-$scriptrequires
 $elflibverrequires"
 
 if [ -f __rpm_noautoreq ] ; then
        for i in `cat __rpm_noautoreq`; do
+               scriptrequires=`echo $scriptrequires | sed "s!\<$i[[:space:]]*!!g"`
                allrequires=`echo $allrequires | sed "s!\<$i[[:space:]]*!!g"`
        done
 fi
 
+# omit autoreqdep for scriptrequires
+echo "$scriptrequires"
+
 # Delete all the provided stuff
 
 echo $filelist|/usr/lib/rpm/find-provides|awk '

diff --git a/rpm.spec b/rpm.spec
index cd28b6800765a8ea00ca07fcb56d0b4b04b4cbbc..737eb0564c57cc39b33a4c04d98253bbae061496 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:       66
+Release:       67
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz