- find-perl-requires, find-requires.patch: grep -v "no package provides"

  not only for sparc (LC_ALL=C must be set, LANG=C is not sufficient)

Changed files:
    rpm-find-perl-requires -> 1.2
    rpm.spec -> 1.174

diff --git a/rpm-find-perl-requires b/rpm-find-perl-requires
index ae77ac85888c291baf11ca68a35c9ec0a25c2bff..fcbee277a67ae7cbcb02fd692aab5998ca464325 100644 (file)
--- a/rpm-find-perl-requires
+++ b/rpm-find-perl-requires
@@ -5,7 +5,7 @@ filelist=`sed "s/['\"]/\\\&/g"`
 
 requires="`echo $filelist|/usr/lib/rpm/find-requires`"
 requires_perl="`/usr/lib/rpm/perl.req $filelist`"
-requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n"  $requires_perl 2>/dev/null`"
+requires_mod="`LC_ALL=C rpm -q --whatprovides --qf "%{NAME}\n"  $requires_perl 2>/dev/null`"
 echo "$requires
 $requires_perl
-$requires_mod"|  sort -u
+$requires_mod"| grep -v "no package provides" | sort -u

diff --git a/rpm.spec b/rpm.spec
index dc78c0893a528ba7c2d57111266d6b612c474eb6..e411896576b49403c3f37972652a8b6f930ad086 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -80,6 +80,7 @@ Summary:      RPM shared libraries
 Summary(pl):   Biblioteki wspó³dzielone rpm-a
 Group:         Libraries
 Group(de):     Libraries
+Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
 Requires:      %{name} = %{version}
@@ -147,7 +148,8 @@ Group(pl):  Aplikacje/Pliki
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Requires:      perl-modules
 Requires:      findutils
-Additional utilities for checking perl provides/requires in rpm packages.
+
+%description perlprov
 Additional utilities for checking perl provides/requires in rpm
 %description -l pl perlprov
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
@@ -225,18 +227,18 @@ autoconf
 # ugly workaround for automake
 sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \
        lib/Makefile.am > lib/Makefile.am.new
-mv lib/Makefile.am.new lib/Makefile.am
+mv -f lib/Makefile.am.new lib/Makefile.am
 automake -a -c
 sed -e 's#cpio.c depends.c#cpio.c $(DBLIBOBJS) depends.c#g' \
        lib/Makefile.in > lib/Makefile.in.new
-mv lib/Makefile.in.new lib/Makefile.in
+mv -f lib/Makefile.in.new lib/Makefile.in
 %configure \
        sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
        --enable-v1-packages
 %configure \
 %{__make} %{?bcond_off_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 sed -e 's/#include <rpmio\.h>/#include <rpm\/rpmio\.h>/g' lib/header.h > lib/header.h.new
-mv lib/header.h.new lib/header.h
+mv -f lib/header.h.new lib/header.h
        --with-python
 
 
@@ -316,7 +318,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/alpha-pld-linux
 %ifarch sparc sparc64
 %endif
-
 %ifarch ppc
 %{_libdir}/rpm/ppc*
 %defattr(644,root,root,755)