- release 26: fixed rpm-find-requires script

(_noautoreq and _noautoreqdep are not the same!
 e.g. _noautoreqdep libGL.so.1 shouldn't remove libGL.so.1 dependency,
 but only `rpm -q --whatprovides libGL.so.1` dependency)

Changed files:
    rpm-find-requires -> 1.6
    rpm.spec -> 1.219

diff --git a/rpm-find-requires b/rpm-find-requires
index e1db63e3537ea8ad8cbc0648632c04920b250a53..584a0113e9cddf970ac3c14996864544e2625c10 100755 (executable)
--- a/rpm-find-requires
+++ b/rpm-find-requires
@@ -79,12 +79,6 @@ if [ -f __rpm_noautoreq ] ; then
        done
 fi
 
-if [ -f __rpm_noautoreqdep ] ; then
-       for i in `cat __rpm_noautoreqdep`; do
-               allrequires=`echo $allrequires | sed "s!\<$i[[:space:]]*!!g"`
-       done
-fi
-
 # Delete all the provided stuff
 
 echo $filelist|/usr/lib/rpm/find-provides|awk '
@@ -100,5 +94,11 @@ notprovreqs=`echo "$allrequires"|awk -f .findreq_delprovs_$$`
 rm .findreq_delprovs_$$
 echo "$notprovreqs" | sort -u
 
+if [ -f __rpm_noautoreqdep ] ; then
+       for i in `cat __rpm_noautoreqdep`; do
+               notprovreqs=`echo $notprovreqs | sed "s!\<$i[[:space:]]*!!g"`
+       done
+fi
+
 echo "$notprovreqs" | LC_ALL=C xargs -r -- rpm -q --whatprovides --qf "%{NAME}\n"  2>/dev/null \
        | grep -v "no package provides" | sort -u

diff --git a/rpm.spec b/rpm.spec
index 2ab0276301e7d512c9b890e0217fcb80c7835b38..06b0cc750b3d1a53b730c8073153ef3e584c2aef 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,7 +3,7 @@ Summary(de):    Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2
-Release:       25
+Release:       26
 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich