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

[notifications at fedoraproject.org]

From 3925e627cb6850e63a880088453037310427f3b4 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 11:20:49 +0200
Subject: Do not use Test::Aggregate::Nested for tests because it's not
 available anymore


diff --git a/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch b/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
new file mode 100644
index 0000000..aa2f683
--- /dev/null
+++ b/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
@@ -0,0 +1,33 @@
+From d3b536b7a55453ce4a00c407f7af7cf8af159cbc 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 12:39:37 +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 8920c7e..6e7fe80 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -79,7 +79,7 @@ my %WriteMakefileArgs = (
+   },
+   "VERSION" => "2.01",
+   "test" => {
+-    "TESTS" => "t/*.t"
++    "RECURSIVE_TEST_FILES" => 1
+   }
+ );
+ 
+-- 
+2.4.3
+
diff --git a/perl-HTML-FormFu.spec b/perl-HTML-FormFu.spec
index 786522f..50098dc 100644
--- a/perl-HTML-FormFu.spec
+++ b/perl-HTML-FormFu.spec
@@ -1,12 +1,18 @@
 Name:           perl-HTML-FormFu
 Version:        2.01
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/HTML-FormFu/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-%{version}.tar.gz
+# Do not use Test::Aggregate::Nested for running tests, bug #1231204
+Patch0:         HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(CGI) >= 3.37
 BuildRequires:  perl(CGI::Simple)
@@ -56,10 +62,11 @@ BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Storable)
 BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(Template)
-BuildRequires:  perl(Test::Aggregate::Nested)
+# Test::Aggregate::Nested disabled
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More) >= 0.92
 BuildRequires:  perl(YAML::XS) >= 0.32
+BuildRequires:  sed
 Requires:       perl(Captcha::reCAPTCHA) >= 0.93
 Requires:       perl(Class::Accessor::Chained::Fast)
 Requires:       perl(Config::Any) >= 0.18
@@ -89,10 +96,19 @@ anything else you might want to do (as long as it involves forms).
 
 %prep
 %setup -q -n HTML-FormFu-%{version}
+%patch0 -p1
 
 find examples -type f | xargs chmod 644
 find examples -type f | xargs sed -i -e 's/\r//'
 
+# 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
+sed -i -e 's|^\^t-aggregate\\/|^t\\/|' MANIFEST.SKIP
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -119,6 +135,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 02 2015 Petr Pisar <ppisar at redhat.com> - 2.01-6
+- 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> - 2.01-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-HTML-FormFu.git/commit/?h=master&id=3925e627cb6850e63a880088453037310427f3b4