Merge branch 'f13'

- update to 5.837

.gitignore

@@ -1 +1,2 @@
-libwww-perl-5.836.tar.gz
+libwww-perl-5.834.tar.gz
+/libwww-perl-5.837.tar.gz

perl-libwww-perl.spec

@@ -1,5 +1,5 @@
 Name:           perl-libwww-perl
-Version:        5.836
+Version:        5.837
 Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
@@ -8,57 +8,37 @@ License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/libwww-perl/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Entities), perl(URI), perl(Test::More), perl(ExtUtils::MakeMaker)
 BuildRequires:  mailcap
 BuildRequires:  perl(Compress::Zlib)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Compress::Zlib)
+Requires:       perl(Compress::Zlib), perl(MIME::Base64), perl(Net::FTP)
 Requires:       perl-HTML-Parser >= 3.33
 Requires:       mailcap
 
 %description
-The libwww-perl collection is a set of Perl modules which provides a
+The libwww-perl collection is a set of Perl modules which provides a simple and
-simple and consistent application programming interface to the
+consistent application programming interface to the World-Wide Web.  The main
-World-Wide Web.  The main focus of the library is to provide classes
+focus of the library is to provide classes and functions that allow you to
-and functions that allow you to write WWW clients. The library also
+write WWW clients. The library also contain modules that are of more general
-contain modules that are of more general use and even classes that
+use and even classes that help you implement simple HTTP servers.
-help you implement simple HTTP servers.
 
+%{?perl_default_filter}
 
 %prep
 %setup -q -n libwww-perl-%{version} 
-
+%{?filter_setup:
-
+%filter_from_provides /perl(HTTP::Headers)/d
-# Filter unwanted Provides:
+%filter_from_requires /perl(HTTP:GHTTP)/d
-cat << \EOF > %{name}-prov
+%filter_from_requires /perl(Win32)/d
-#!/bin/sh
+%filter_from_requires /perl(Authen::NTLM)/d
-%{__perl_provides} $* |\
+%?perl_default_filter
-  sed -e '/perl(HTTP::Headers)$/d'
+}
-EOF
-
-%define __perl_provides %{_builddir}/libwww-perl-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(HTTP::GHTTP)/d' |\
-  sed -e '/perl(Win32)/d' |\
-  sed -e '/perl(Authen::NTLM)/d'
-EOF
-
-%define __perl_requires %{_builddir}/libwww-perl-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 
 %build
 # Install the aliases by default
-%{__perl} Makefile.PL INSTALLDIRS=vendor --aliases < /dev/null
+%{__perl} Makefile.PL INSTALLDIRS=perl --aliases < /dev/null
 make %{?_smp_mflags}
 
 %install
@@ -76,7 +56,7 @@ done
 # Use system wide MIME types (link also to blib/... for "make test").  Doing
 # this stuff before "make install" would not cause the symlink to be packaged
 # but a copy of /etc/mime.types.
-for file in {blib/lib,$RPM_BUILD_ROOT%{perl_vendorlib}}/LWP/media.types ; do
+for file in {blib/lib,$RPM_BUILD_ROOT%{perl_privlib}}/LWP/media.types ; do
   [ ! -f $file ] && echo ERROR && exit 1
   ln -sf /etc/mime.types $file
 done
@@ -93,20 +73,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS Changes README*
 %{_bindir}/*
-%{perl_vendorlib}/lwp*.pod
+%{perl_privlib}/lwp*.pod
-%{perl_vendorlib}/LWP.pm
+%{perl_privlib}/LWP.pm
-%{perl_vendorlib}/Bundle/
+%{perl_privlib}/Bundle/
-%{perl_vendorlib}/File/
+%{perl_privlib}/File/
-%{perl_vendorlib}/HTML/
+%{perl_privlib}/HTML/
-%{perl_vendorlib}/HTTP/
+%{perl_privlib}/HTTP/
-%{perl_vendorlib}/LWP/
+%{perl_privlib}/LWP/
-%{perl_vendorlib}/Net/
+%{perl_privlib}/Net/
-%{perl_vendorlib}/WWW/
+%{perl_privlib}/WWW/
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Sep 27 2010 Marcela Mašláňová <mmaslano@redhat.com> 5.837-1
+- update
+
 * Mon Jul 12 2010 Marcela Maslanova <mmaslano@redhat.com> - 5.836-1
 - update
 

sources

@@ -1 +1 @@
-424325417ed5a85700e604317872b588  libwww-perl-5.836.tar.gz
+9bbf1bce482b0bac98bb4f04253c03d0  libwww-perl-5.837.tar.gz