ppisar pushed to perl-Catalyst-Controller-HTML-FormFu (master). "Do not use Test::Aggregate::Nested for tests because it's not available anymore"

[notifications at fedoraproject.org]

From 0af1d7222862cec8aabc38f71b4ff5442b483e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Fri, 2 Oct 2015 14:24:41 +0200
Subject: Do not use Test::Aggregate::Nested for tests because it's not
 available anymore


diff --git a/Catalyst-Controller-HTML-FormFu-1.00-Execute-tests-recusively-under-t.patch b/Catalyst-Controller-HTML-FormFu-1.00-Execute-tests-recusively-under-t.patch
new file mode 100644
index 0000000..d0e85f6
--- /dev/null
+++ b/Catalyst-Controller-HTML-FormFu-1.00-Execute-tests-recusively-under-t.patch
@@ -0,0 +1,33 @@
+From 5f2a260aff5839ced06b3f57586ac469969ea653 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Fri, 2 Oct 2015 14:22:00 +0200
+Subject: [PATCH] Execute tests recusively under t
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Required to run tests moved from t-aggregate to t.
+
+bug #1231204
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 10e62d5..139c9fc 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -46,7 +46,7 @@ my %WriteMakefileArgs = (
+   },
+   "VERSION" => "1.00",
+   "test" => {
+-    "TESTS" => "t/*.t"
++    "RECURSIVE_TEST_FILES" => 1
+   }
+ );
+ 
+-- 
+2.4.3
+
diff --git a/perl-Catalyst-Controller-HTML-FormFu.spec b/perl-Catalyst-Controller-HTML-FormFu.spec
index 7939a2b..06005c8 100644
--- a/perl-Catalyst-Controller-HTML-FormFu.spec
+++ b/perl-Catalyst-Controller-HTML-FormFu.spec
@@ -1,15 +1,21 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
 Version:        1.00
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
 
 URL:            http://search.cpan.org/dist/Catalyst-Controller-HTML-FormFu/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Catalyst-Controller-HTML-FormFu-%{version}.tar.gz
+# Do not use Test::Aggregate::Nested for running tests, bug #1231204
+Patch0:         Catalyst-Controller-HTML-FormFu-1.00-Execute-tests-recusively-under-t.patch
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl
 BuildRequires:  perl(inc::Module::Install)
 BuildRequires:  perl(Module::Install::Metadata)
+BuildRequires:  sed
 # Run-time:
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
@@ -42,7 +48,7 @@ BuildRequires:  perl(Catalyst::Plugin::Session)
 BuildRequires:  perl(Catalyst::Plugin::Session::State::Cookie)
 BuildRequires:  perl(Catalyst::Plugin::Session::Store::File)
 BuildRequires:  perl(Catalyst::View::TT)
-BuildRequires:  perl(Test::Aggregate::Nested)
+# Test::Aggregate::Nested disabled
 # Config::General not used
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(FindBin)
@@ -69,6 +75,13 @@ This base controller merges the functionality of HTML::FormFu with Catalyst.
 
 %prep
 %setup -q -n Catalyst-Controller-HTML-FormFu-%{version}
+%patch0 -p1
+# Do not use Test::Aggregate::Nested for running tests, bug #1231204
+rm t/aggregate.t
+sed -i -e '/^t\/aggregate\.t/d' MANIFEST
+mv t-aggregate/* t
+find t -type f -exec sed -i -e 's|\<t-aggregate\>|t|' {} +
+sed -i -e 's|^t-aggregate/|t/|' MANIFEST
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +105,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 02 2015 Petr Pisar <ppisar at redhat.com> - 1.00-4
+- Do not use Test::Aggregate::Nested for tests because it's not available
+  anymore (bug #1231204)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Catalyst-Controller-HTML-FormFu.git/commit/?h=master&id=0af1d7222862cec8aabc38f71b4ff5442b483e00