- fixed swapped find-requires and find-provides

- s/noautoprovdep/noautoprov/ in find-provides

Changed files:
    rpm-find-provides -> 1.2
    rpm.spec -> 1.184

diff --git a/rpm-find-provides b/rpm-find-provides
index bb16bc379586e6fc07f496bf63c0d52ece94a322..160c7a6a6c47c0d1474223dde74e69c72cf279bc 100644 (file)
--- a/rpm-find-provides
+++ b/rpm-find-provides
@@ -33,8 +33,8 @@ allprovides=`for f in $filelist; do
     fi
 done | sort -u`
 
-if [ -f __rpm_noautoprovdep ] ; then
-       for i in `cat __rpm_noautoprovdep`; do
+if [ -f __rpm_noautoprov ] ; then
+       for i in `cat __rpm_noautoprov`; do
                allprovides=`echo $allprovides | sed "s!\<$i[[:space:]]*!!g"`
        done
 fi

diff --git a/rpm.spec b/rpm.spec
index d20bd8cef75cba1cf0434d34bcdc6b65ea88608a..41787ce227905ac590d75729d057fb40f4620928 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,9 +26,9 @@ Patch3:               %{name}-rpmpopt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-db3.patch
 Patch6:                %{name}-segv.patch
-Patch7:        %{name}-am_fix.patch
-Patch8:        %{name}-perl-req-perlfile.patch
-Patch9:        %{name}-installplatform.patch
+Patch7:                %{name}-am_fix.patch
+Patch8:                %{name}-perl-req-perlfile.patch
+Patch9:                %{name}-installplatform.patch
 Patch10:       %{name}-cache.patch
 Patch11:       %{name}-suggestions.patch
 Patch12:       %{name}-rh-lame.patch
@@ -250,8 +250,8 @@ install macros.pld $RPM_BUILD_ROOT%{_libdir}/rpm/macros.pld
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
 install macros.python $RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
 
-install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
-install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
+install %{SOURCE1} doc/manual/groups
+install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
 install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
 install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires