[perl-TAP-Harness-Env/f20] Incorporate further review feedback (#1067098)

[Paul Howarth]

commit 83316cc3cf47c3c5cd9ee8f3a0b93b057ec0a47a
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Feb 27 13:39:44 2014 +0000

    Incorporate further review feedback (#1067098)
    
    - Remove bundled Test-Simple from test suite and use system version instead
    - Add further build requirements for the test suite

 TAP-Harness-Env-3.30-tests.patch |   18 +++++++++++++++---
 perl-TAP-Harness-Env.spec        |   23 +++++++++++++++++++++--
 2 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/TAP-Harness-Env-3.30-tests.patch b/TAP-Harness-Env-3.30-tests.patch
index b266ecb..702ef69 100644
--- a/TAP-Harness-Env-3.30-tests.patch
+++ b/TAP-Harness-Env-3.30-tests.patch
@@ -1,6 +1,6 @@
 --- t/000-load.t
 +++ t/000-load.t
-@@ -17,28 +17,15 @@
+@@ -17,28 +17,15 @@ my @classes = uniq(
      map { file_to_mod($_) } filter_lib( keys %$manifest )
  );
  
@@ -9,9 +9,10 @@
  
  for my $class (@classes) {
      use_ok $class or BAIL_OUT("Could not load $class");
-     is $class->VERSION, TAP::Parser->VERSION,
+-    is $class->VERSION, TAP::Parser->VERSION,
 -      "... and $class should have the correct version";
-+      "... and $class should have the correct version" unless $class eq "TAP::Harness::Env";
++    is $class->VERSION, TAP::Harness::Env->VERSION,
++      "... and $class should have the correct version" unless $class eq FIRST;
  }
  
 -my @orphans = diff(
@@ -32,3 +33,14 @@
    unless $ENV{PERL_CORE};
  
  sub intersection {
+--- t/proveversion.t
++++ t/proveversion.t
+@@ -20,7 +20,7 @@ SKIP: {
+     my $ans = util::stdout_of(
+         sub {
+             system( $^X,
+-                "bin/prove",
++                "/usr/bin/prove",
+                 "-l",
+                 "--formatter=TAP::Formatter::HTML",
+                 "--tapversion=13",
diff --git a/perl-TAP-Harness-Env.spec b/perl-TAP-Harness-Env.spec
index e029150..d22a703 100644
--- a/perl-TAP-Harness-Env.spec
+++ b/perl-TAP-Harness-Env.spec
@@ -3,7 +3,7 @@
 
 Name:		perl-TAP-Harness-Env
 Version:	3.30
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Parsing harness related environmental variables where appropriate
 License:	GPL+ or Artistic
 URL:		https://metacpan.org/release/Test-Harness
@@ -20,19 +20,26 @@ BuildRequires:	perl(TAP::Object)
 BuildRequires:	perl(Text::ParseWords)
 BuildRequires:	perl(warnings)
 # Test Suite
+BuildRequires:	/usr/bin/prove
 BuildRequires:	perl(App::Prove)
 BuildRequires:	perl(App::Prove::State)
 BuildRequires:	perl(App::Prove::State::Result)
 BuildRequires:	perl(base)
 BuildRequires:	perl(Config)
+BuildRequires:	perl(Data::Dumper)
+BuildRequires:	perl(Encode)
 BuildRequires:	perl(Exporter)
+BuildRequires:	perl(File::Path)
 BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(File::Spec::Functions)
+BuildRequires:	perl(File::Temp)
 BuildRequires:	perl(Getopt::Long)
 BuildRequires:	perl(IO::File)
 BuildRequires:	perl(IO::Handle)
 BuildRequires:	perl(lib)
+BuildRequires:	perl(Symbol)
 BuildRequires:	perl(TAP::Base)
+BuildRequires:	perl(TAP::Formatter::Base)
 BuildRequires:	perl(TAP::Formatter::Console)
 BuildRequires:	perl(TAP::Harness)
 BuildRequires:	perl(TAP::Parser)
@@ -59,6 +66,12 @@ BuildRequires:	perl(TAP::Parser::YAMLish::Writer)
 BuildRequires:	perl(Test::Harness)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Time::HiRes)
+BuildRequires:	perl(YAML)
+# Optional test requirements not yet in EPEL-7
+%if "%{?rhel}" != "7"
+BuildRequires:	perl(TAP::Formatter::HTML)
+BuildRequires:	perl(TAP::Harness::Archive)
+%endif
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Conflicts:	perl-Test-Harness >= 3.29
@@ -71,7 +84,8 @@ with TAP::Harness.
 %setup -q -n Test-Harness-%{version}
 
 # Remove bits that we're going to pick up from the system Test-Harness
-perl -ne 'print unless /^(bin\/|HACKING\.pod|lib\/)/ and not /^lib\/TAP\/Harness\/Env\.pm$/;' MANIFEST > MANIFEST.mod
+# Also remove bundled Test-Simple modules
+perl -ne 'print unless /^(bin\/|HACKING\.pod|lib\/|t\/lib\/Test\/)/ and not /^lib\/TAP\/Harness\/Env\.pm$/;' MANIFEST > MANIFEST.mod
 for f in $(grep -Fvxf MANIFEST.mod MANIFEST); do
 	rm $f
 done
@@ -101,6 +115,11 @@ make test
 %{_mandir}/man3/TAP::Harness::Env.3pm*
 
 %changelog
+* Wed Feb 26 2014 Paul Howarth <paul at city-fan.org> - 3.30-3
+- Incorporate further review feedback (#1067098)
+  - Remove bundled Test-Simple from test suite and use system version instead
+  - Add further build requirements for the test suite
+
 * Wed Feb 26 2014 Paul Howarth <paul at city-fan.org> - 3.30-2
 - Incorporate review feedback (#1067098)
   - Remove files in %%prep that we won't be shipping, so as to run test suite