commit 83313a0f4cb0e01e163a2f631ad96dd28ed5b7ae
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Wed Dec 10 15:04:08 2014 +0100
Make Test::Deep tests optional as it's not in the core in contrast to the CGI-Fast
CGI-Fast-2.04-Make-Test-Deep-tests-optional.patch | 35 +++++++++++++++++++++
perl-CGI-Fast.spec | 11 ++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/CGI-Fast-2.04-Make-Test-Deep-tests-optional.patch b/CGI-Fast-2.04-Make-Test-Deep-tests-optional.patch
new file mode 100644
index 0000000..9525c4d
--- /dev/null
+++ b/CGI-Fast-2.04-Make-Test-Deep-tests-optional.patch
@@ -0,0 +1,35 @@
+From fd6a4a7bd85e4d9448701ea2a64c2526dce6a23d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Wed, 10 Dec 2014 14:58:38 +0100
+Subject: [PATCH 2/2] Make Test::Deep tests optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ t/003_env_pollution.t | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/t/003_env_pollution.t b/t/003_env_pollution.t
+index 74b4b10..c3c3dde 100644
+--- a/t/003_env_pollution.t
++++ b/t/003_env_pollution.t
+@@ -3,8 +3,12 @@
+ use strict;
+ use warnings;
+
+-use Test::More tests => 5;
+-use Test::Deep;
++use Test::More;
++BEGIN {
++ eval "use Test::Deep 0.11; 1" or
++ plan skip_all => 'Test::Deep not available';
++}
++plan tests => 5;
+
+ use CGI::Fast socket_path => ":7070";
+
+--
+1.9.3
+
diff --git a/perl-CGI-Fast.spec b/perl-CGI-Fast.spec
index e74061b..438da11 100644
--- a/perl-CGI-Fast.spec
+++ b/perl-CGI-Fast.spec
@@ -8,6 +8,9 @@ URL: http://search.cpan.org/dist/CGI-Fast/
Source0: http://www.cpan.org/authors/id/L/LE/LEEJO/CGI-Fast-%{version}.tar.gz
# Do not load Test::Deep where not needed
Patch0: CGI-Fast-2.04-Remove-useless-loading-of-Test-Deep.patch
+# Make Test::Deep tests optional as it's not in the core in contrast to the
+# CGI-Fast
+Patch1: CGI-Fast-2.04-Make-Test-Deep-tests-optional.patch
BuildArch: noarch
BuildRequires: perl
BuildRequires: perl(CGI) >= 4.00
@@ -19,10 +22,13 @@ BuildRequires: perl(FCGI) >= 0.67
BuildRequires: perl(File::Spec) >= 0.82
BuildRequires: perl(if)
BuildRequires: perl(strict)
-BuildRequires: perl(Test::Deep) >= 0.11
BuildRequires: perl(Test::More) >= 0.98
BuildRequires: perl(vars)
BuildRequires: perl(warnings)
+# Optional tests:
+%if !%{defined perl_bootstrap}
+BuildRequires: perl(Test::Deep) >= 0.11
+%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%if 0%(perl -e 'print $] >= 5.019')
Requires: perl(deprecate)
@@ -46,6 +52,7 @@ performance improvements.
%prep
%setup -q -n CGI-Fast-%{version}
%patch0 -p1
+%patch1 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor
@@ -67,6 +74,8 @@ make test
%changelog
* Wed Dec 10 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 2.04-2
- Do not load Test::Deep where not needed
+- Make Test::Deep tests optional as it's not in the core in contrast to the
+ CGI-Fast
* Mon Oct 13 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 2.04-1
- 2.04 bump
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
