[perl-HTTP-Message] 6.04 bump

[Petr Pisar]

commit 5753a95b73d63cffd7945ff5dfab37d228ed3be2
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Oct 2 15:25:02 2012 +0200

    6.04 bump

 .gitignore             |    1 +
 perl-HTTP-Message.spec |   42 +++++++++++++++---------------------------
 sources                |    2 +-
 3 files changed, 17 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23ae9f0..fbb52d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /HTTP-Message-6.01.tar.gz
 /HTTP-Message-6.02.tar.gz
 /HTTP-Message-6.03.tar.gz
+/HTTP-Message-6.04.tar.gz
diff --git a/perl-HTTP-Message.spec b/perl-HTTP-Message.spec
index 5bf7137..3426154 100644
--- a/perl-HTTP-Message.spec
+++ b/perl-HTTP-Message.spec
@@ -1,25 +1,23 @@
 Name:           perl-HTTP-Message
-Version:        6.03
-Release:        5%{?dist}
+Version:        6.04
+Release:        1%{?dist}
 Summary:        HTTP style message
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/HTTP-Message/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Message-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# Run-time:
 BuildRequires:  perl(Compress::Raw::Zlib)
-BuildRequires:  perl(Encode) >= 2.12
+BuildRequires:  perl(Encode) >= 2.21
 BuildRequires:  perl(Encode::Locale) >= 1
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-# Break build-time cycle (bug #810223) HTML::Parser <-> HTTP::Headers 
-%if 0%{!?perl_bootstrap:1}
-BuildRequires:  perl(HTML::Parser) >= 3.33
-%endif
 BuildRequires:  perl(HTTP::Date) >= 6
 BuildRequires:  perl(IO::Compress::Bzip2) >= 2.021
 BuildRequires:  perl(IO::Compress::Deflate)
 BuildRequires:  perl(IO::Compress::Gzip)
+BuildRequires:  perl(IO::HTML)
 BuildRequires:  perl(IO::Uncompress::Bunzip2) >= 2.021
 BuildRequires:  perl(IO::Uncompress::Gunzip)
 BuildRequires:  perl(IO::Uncompress::Inflate)
@@ -31,16 +29,16 @@ BuildRequires:  perl(URI) >= 1.10
 # Tests only:
 BuildRequires:  perl(Test)
 BuildRequires:  perl(Test::More)
-# Testing requires Time::Local used on MasOS only
+# Testing requires Time::Local on MacOS only
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Compress::Raw::Zlib)
-Requires:       perl(Encode) >= 2.12
+Requires:       perl(Encode) >= 2.21
 Requires:       perl(Encode::Locale) >= 1
-Requires:       perl(HTML::Parser) >= 3.33
 Requires:       perl(HTTP::Date) >= 6
 Requires:       perl(IO::Compress::Bzip2) >= 2.021
 Requires:       perl(IO::Compress::Deflate)
 Requires:       perl(IO::Compress::Gzip)
+Requires:       perl(IO::HTML)
 Requires:       perl(IO::Uncompress::Bunzip2) >= 2.021
 Requires:       perl(IO::Uncompress::Gunzip)
 Requires:       perl(IO::Uncompress::Inflate)
@@ -52,14 +50,8 @@ Requires:       perl(URI) >= 1.10
 Conflicts:      perl-libwww-perl < 6
 
 # Remove underspecified dependencies
-%filter_from_requires /^perl(HTTP::Date)\s*$/d
-%filter_from_requires /^perl(URI)\s*$/d
-%filter_from_provides /^perl(HTTP::Headers)\s*$/d
-%filter_setup
-
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(HTTP::Date|URI\\)$
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(HTTP::Headers\\)$
-
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((HTTP::Date|URI)\\)$
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(HTTP::Headers\\)$
 
 %description
 The HTTP-Message distribution contains classes useful for representing the
@@ -74,26 +66,22 @@ requests, responses and the headers contained within them.
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%if 0%{!?perl_bootstrap:1}
 make test
-%else
-# t/message-charset.t exercises HTTP::Message, which requires HTML::Parser
-make test TEST_FILES="$(echo $(find t/ -name '*.t' | grep -Fvx t/message-charset.t))"
-%endif
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 02 2012 Petr Pisar <ppisar at redhat.com> - 6.04-1
+- 6.04 bump
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 3cccdc3..1aee6c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d41b22c7c01b974f2b4e85d401a6b552  HTTP-Message-6.03.tar.gz
+d3cedbb4b1ca476ab2b0a70b5c289fe1  HTTP-Message-6.04.tar.gz