>From 42a3d1bcf4dce968fb3869d08438b126ac8382d8 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman <emmanuel@xxxxxxxxx> Date: Sun, 12 Apr 2015 11:01:09 +0200 Subject: Update to 0.21 diff --git a/.gitignore b/.gitignore index cda38e8..ec4f1ea 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Catalyst-Plugin-SubRequest-0.16.tar.gz /Catalyst-Plugin-SubRequest-0.17.tar.gz /Catalyst-Plugin-SubRequest-0.19.tar.gz /Catalyst-Plugin-SubRequest-0.20.tar.gz +/Catalyst-Plugin-SubRequest-0.21.tar.gz diff --git a/Catalyst-Plugin-SubRequest-5.9.patch b/Catalyst-Plugin-SubRequest-5.9.patch deleted file mode 100644 index dae91c9..0000000 --- a/Catalyst-Plugin-SubRequest-5.9.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: compatibility with Catalyst 5.9 - Taken from https://gist.github.com/jjn1056/9947765 -Author: John Napiorkowski -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94392 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747502 - ---- a/lib/Catalyst/Plugin/SubRequest.pm -+++ b/lib/Catalyst/Plugin/SubRequest.pm -@@ -102,18 +102,29 @@ sub sub_request_response { - - # need this so that - my $writer = Catalyst::Plugin::SubRequest::Writer->new; -- my $response_cb = sub { $writer }; -+ my $response_cb = sub { -+ my $response = shift; -+ my ($status, $headers, $body) = @$response; -+ if($body) { -+ return; -+ } else { -+ return $writer; -+ } -+ }; -+ - my $i_ctx = $class->prepare( env => $env, response_cb => $response_cb ); - $i_ctx->stash($stash); - $i_ctx->dispatch; - $i_ctx->finalize; - $c->stats->profile( end => 'subrequest: ' . $path ) if $c->debug; - -- $i_ctx->response->body($writer->body); -+ if($writer->_is_closed) { -+ $i_ctx->response->body($writer->body); -+ } - - return $i_ctx->response; - } - - package Catalyst::Plugin::SubRequest::Writer; - use Moose; - has body => ( diff --git a/auto.ini b/auto.ini deleted file mode 100644 index fb001f2..0000000 --- a/auto.ini +++ /dev/null @@ -1,5 +0,0 @@ -[add_build_requires] -perl(HTTP::Date)=0 -perl(HTTP::Request::AsCGI)=0 -perl(Test::Pod)=0 -perl(Time::HiRes)=0 diff --git a/perl-Catalyst-Plugin-SubRequest.spec b/perl-Catalyst-Plugin-SubRequest.spec index 4642a71..a27835d 100644 --- a/perl-Catalyst-Plugin-SubRequest.spec +++ b/perl-Catalyst-Plugin-SubRequest.spec @@ -1,14 +1,11 @@ Name: perl-Catalyst-Plugin-SubRequest Summary: Make subrequests to actions in Catalyst -Version: 0.20 -Release: 8%{?dist} +Version: 0.21 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries -Source0: http://search.cpan.org/CPAN/authors/id/E/ED/EDENC/Catalyst-Plugin-SubRequest-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-SubRequest-%{version}.tar.gz URL: http://search.cpan.org/dist/Catalyst-Plugin-SubRequest/ -# Patch taken from the debian package of this module -# See rt.cpan.org #94392 for details -Patch0: Catalyst-Plugin-SubRequest-5.9.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch @@ -31,7 +28,6 @@ it will work like an external url call. %prep %setup -q -n Catalyst-Plugin-SubRequest-%{version} -%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -54,6 +50,10 @@ TEST_POD=1 make test %{_mandir}/man3/Catalyst* %changelog +* Sun Apr 12 2015 Emmanuel Seyman <emmanuel@xxxxxxxxx> - 0.21-1 +- Update to 0.21 +- Drop patch (no longer needed) + * Wed Dec 10 2014 Emmanuel Seyman <emmanuel@xxxxxxxxx> - 0.20-8 - Bump to rebuild diff --git a/sources b/sources index 8e58a62..1427ec2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16cf147a4bd8075f98b207bbb7d4248e Catalyst-Plugin-SubRequest-0.20.tar.gz +4c363b5062fcdb43babc2b1776f1c8bc Catalyst-Plugin-SubRequest-0.21.tar.gz -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-Catalyst-Plugin-SubRequest.git/commit/?h=master&id=42a3d1bcf4dce968fb3869d08438b126ac8382d8 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel
