[perl-Plack] - Upstream update. - Hack around incorrect hard-coded path to mod_perl.so. - Activate Apache2 test.

[corsepiu]

commit c15bb3c80c33167940bf46a6e4287644c93f9c3d
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jan 18 13:45:56 2011 +0100

    - Upstream update.
    - Hack around incorrect hard-coded path to mod_perl.so.
    - Activate Apache2 test.

 .gitignore      |    1 +
 perl-Plack.spec |   24 +++++++++++++++++++++---
 sources         |    2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c825d33..137e36b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Plack-0.9959.tar.gz
 /Plack-0.9960.tar.gz
+/Plack-0.9963.tar.gz
diff --git a/perl-Plack.spec b/perl-Plack.spec
index f1e3fa0..9f26621 100644
--- a/perl-Plack.spec
+++ b/perl-Plack.spec
@@ -1,5 +1,5 @@
 Name:           perl-Plack
-Version:        0.9960
+Version:        0.9963
 Release:        1%{?dist}
 Summary:        Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
 License:        GPL+ or Artistic
@@ -25,8 +25,12 @@ BuildRequires:  perl(Try::Tiny)
 BuildRequires:  perl(URI) >= 1.36
 
 # for improved tests
+BuildRequires:  perl(Authen::Simple::Adapter)
 BuildRequires:  perl(Authen::Simple::Passwd)
+BuildRequires:  perl(CGI)
+BuildRequires:  perl(CGI::Compile)
 BuildRequires:  perl(CGI::Emulate::PSGI)
+BuildRequires:  perl(Class::Data::Inheritable)
 BuildRequires:  perl(FCGI)
 BuildRequires:  perl(FCGI::Client)
 BuildRequires:  perl(FCGI::ProcManager)
@@ -38,6 +42,12 @@ BuildRequires:  perl(Log::Log4perl)
 BuildRequires:  perl(MIME::Types)
 BuildRequires:  perl(Module::Refresh)
 
+# For mod_perl.so
+BuildRequires:  mod_perl >= 2
+
+# For httpd tests
+BuildRequires:  /usr/sbin/httpd
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +58,10 @@ frameworks. Plack is like Ruby's Rack or Python's Paste for WSGI.
 %prep
 %setup -q -n Plack-%{version}
 
+# Fedora's mod_perl.so is under modules/
+sed -i -e 's,libexec/apache2/mod_perl.so,modules/mod_perl.so,' \
+t/Plack-Handler/apache2.t t/Plack-Handler/apache2-registry.t
+
 %build
 # --skipdeps causes ExtUtils::AutoInstall not to try auto-installing
 # missing modules
@@ -65,7 +79,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test TEST_APACHE2=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/HTTP
 # Used by Plack/Test
 %{perl_vendorlib}/auto/*
-%exclude %{perl_vendorlib}/auto/share/dist/Plack/stuff..
 %exclude %{perl_vendorlib}/auto/share/dist/Plack/#foo
 # Abandoned/Unsupported in Fedora: Apache1
 %exclude %{perl_vendorlib}/Plack/Server/Apache1.pm
@@ -92,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 18 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.9963-1
+- Upstream update.
+- Hack around incorrect hard-coded path to mod_perl.so.
+- Activate Apache2 test.
+
 * Mon Jan 03 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.9960-1
 - Upstream update.
 
diff --git a/sources b/sources
index 2194ee2..310c630 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c52f0d1739dca2ac3c5d413c0a56d3b  Plack-0.9960.tar.gz
+34271b656dc9733ecbcd053b49c9c17b  Plack-0.9963.tar.gz