From 0f53d229deaf3136b0a49000c25ee063f40423cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Fri, 2 Oct 2015 14:10:20 +0200
Subject: Do not use Test::Aggregate::Nested for tests because it's not
available anymore
diff --git a/HTML-FormFu-MultiForm-1.00-Execute-tests-recusively-under-t.patch
b/HTML-FormFu-MultiForm-1.00-Execute-tests-recusively-under-t.patch
new file mode 100644
index 0000000..c9bbca6
--- /dev/null
+++ b/HTML-FormFu-MultiForm-1.00-Execute-tests-recusively-under-t.patch
@@ -0,0 +1,33 @@
+From ae9bd2890a2cb39f47d459ce416865176925753e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Fri, 2 Oct 2015 14:07:49 +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(a)redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index de4b77a..8b28260 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -37,7 +37,7 @@ my %WriteMakefileArgs = (
+ },
+ "VERSION" => "1.00",
+ "test" => {
+- "TESTS" => "t/*.t"
++ "RECURSIVE_TEST_FILES" => 1
+ }
+ );
+
+--
+2.4.3
+
diff --git a/perl-HTML-FormFu-MultiForm.spec b/perl-HTML-FormFu-MultiForm.spec
index dd6ce86..d55df45 100644
--- a/perl-HTML-FormFu-MultiForm.spec
+++ b/perl-HTML-FormFu-MultiForm.spec
@@ -1,16 +1,22 @@
Name: perl-HTML-FormFu-MultiForm
Version: 1.00
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Handle multi-page/stage forms
License: GPL+ or Artistic
Group: Development/Libraries
URL:
http://search.cpan.org/dist/HTML-FormFu-MultiForm/
Source0:
http://www.cpan.org/authors/id/C/CF/CFRANKS/HTML-FormFu-MultiForm-%{versi...
+# Do not use Test::Aggregate::Nested for running tests, bug #1231204
+Patch0: HTML-FormFu-MultiForm-1.00-Execute-tests-recusively-under-t.patch
BuildArch: noarch
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: make
BuildRequires: perl
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
BuildRequires: perl(strict)
BuildRequires: perl(warnings)
+BuildRequires: sed
# Run-time:
BuildRequires: perl(Carp)
BuildRequires: perl(Clone) >= 0.31
@@ -28,7 +34,7 @@ BuildRequires: perl(overload)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Storable)
# Test:
-BuildRequires: perl(Test::Aggregate::Nested) >= 0.371
+# Test::Aggregate::Nested 0.371 disabled
BuildRequires: perl(Test::More) >= 0.92
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo
$version))
Requires: perl(Clone) >= 0.31
@@ -46,6 +52,13 @@ Multi-page support for HTML::FormFu, a Perl HTML form framework.
%prep
%setup -q -n HTML-FormFu-MultiForm-%{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
@@ -61,11 +74,16 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
PERL_HASH_SEED=0 make test
%files
-%doc Changes LICENSE README
+%license LICENSE
+%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%changelog
+* Fri Oct 02 2015 Petr Pisar <ppisar(a)redhat.com> - 1.00-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(a)lists.fedoraproject.org> -
1.00-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-HTML-FormFu-MultiForm.git/commit/...