From a5b3c93c3cc087144a9635c0cf7f2a12d0deb01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> Date: Tue, 19 May 2015 13:24:42 +0200 Subject: Use stderr capturing mechanims that works with Catalyst > 5.90079
diff --git a/Catalyst-View-Mason-0.19-Use-Capture-Tiny-IO-Capture.patch b/Catalyst-View-Mason-0.19-Use-Capture-Tiny-IO-Capture.patch new file mode 100644 index 0000000..3d9a1ba --- /dev/null +++ b/Catalyst-View-Mason-0.19-Use-Capture-Tiny-IO-Capture.patch @@ -0,0 +1,58 @@ +From a0354cfbfef1072bc35cc0cf804a4fb7e2cacbe1 Mon Sep 17 00:00:00 2001 +From: Kent Fredric <Kent Fredric> +Date: Tue, 19 May 2015 13:20:06 +0200 +Subject: [PATCH] Use Capture::Tiny IO::Capture +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just use a more reasonable IO redirection system (Capture::Tiny) +instead of relying on a quirky tied glob interface. + +CPAN RT#102381 + +Signed-off-by: Petr Písař <ppi...@redhat.com> +--- + t/debug.t | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/t/debug.t b/t/debug.t +index a2abcfe..e2c4af3 100644 +--- a/t/debug.t ++++ b/t/debug.t +@@ -4,8 +4,8 @@ use strict; + use warnings; + use Test::More; + +-eval "use IO::Capture::Stderr"; +-plan skip_all => "IO::Capture::Stderr required for debug testing" if $@; ++eval "use Capture::Tiny"; ++plan skip_all => "Capture::Tiny required for debug testing" if $@; + + plan tests => 3; + +@@ -14,15 +14,15 @@ use lib "$FindBin::Bin/lib"; + + $ENV{CATALYST_DEBUG} = 1; + +-my $capture = IO::Capture::Stderr->new; +-$capture->start; ++my $response; ++my $capture = Capture::Tiny::capture_stderr(sub{ + +-use_ok('Catalyst::Test', 'TestApp'); ++ use_ok('Catalyst::Test', 'TestApp'); + +-my $response = request('/test'); ++ $response = request('/test'); + +-$capture->stop; ++}); + + ok($response->is_success, 'request ok'); + +-like(join('', $capture->read), qr{\[debug\] Rendering component "/test"}, 'debug message ok'); ++like($capture, qr{\[debug\] Rendering component "/test"}, 'debug message ok'); +-- +2.1.0 + diff --git a/perl-Catalyst-View-Mason.spec b/perl-Catalyst-View-Mason.spec index fabef70..507eb13 100644 --- a/perl-Catalyst-View-Mason.spec +++ b/perl-Catalyst-View-Mason.spec @@ -1,18 +1,21 @@ Name: perl-Catalyst-View-Mason Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mason View Class License: GPL+ or Artistic URL: http://search.cpan.org/dist/Catalyst-View-Mason/ Source0: http://www.cpan.org/authors/id/F/FL/FLORA/Catalyst-View-Mason-%{version}.tar.gz +# Use stderr capturing mechanims that works with Catalyst > 5.90079, +# bug #1190033, CPAN RT#102381 +Patch0: Catalyst-View-Mason-0.19-Use-Capture-Tiny-IO-Capture.patch BuildArch: noarch BuildRequires: perl(Catalyst) >= 5.50 BuildRequires: perl(Catalyst::Helper) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Mason) -BuildRequires: perl(IO::Capture::Stderr) +BuildRequires: perl(Capture::Tiny) BuildRequires: perl(MRO::Compat) BuildRequires: perl(parent) BuildRequires: perl(Test::Exception) @@ -29,6 +32,7 @@ Catalyst::View::Mason comes to the rescue. %prep %setup -q -n Catalyst-View-Mason-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -50,6 +54,10 @@ make test %{_mandir}/man3/Catalyst* %changelog +* Tue May 19 2015 Petr Pisar <ppi...@redhat.com> - 0.19-2 +- Use stderr capturing mechanims that works with Catalyst > 5.90079 + (bug #1190033) + * Thu Jan 01 2015 Emmanuel Seyman <emman...@seyman.fr> - 0.19-1 - Update to 0.19 - Drop no-longer-used macros and steps -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-Catalyst-View-Mason.git/commit/?h=f22&id=a5b3c93c3cc087144a9635c0cf7f2a12d0deb01c -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel