diff --git a/Dist-CheckConflicts-0.10-old-Test::More.patch b/Dist-CheckConflicts-0.11-old-Test::More.patch similarity index 88% rename from Dist-CheckConflicts-0.10-old-Test::More.patch rename to Dist-CheckConflicts-0.11-old-Test::More.patch index f8da3e1..2105170 100644 --- a/Dist-CheckConflicts-0.10-old-Test::More.patch +++ b/Dist-CheckConflicts-0.11-old-Test::More.patch @@ -5,7 +5,7 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 4; ++use Test::More tests => 2; use Test::Fatal; use lib 't/lib/also'; @@ -21,7 +21,7 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 6; ++use Test::More tests => 4; use lib 't/lib/basic'; { @@ -37,7 +37,7 @@ use warnings; -use Test::More; -+use Test::More tests => 17; ++use Test::More tests => 12; use Test::Fatal; use lib 't/lib/conflicts'; @@ -53,7 +53,7 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 16; ++use Test::More tests => 12; use Test::Fatal; use lib 't/lib/dist'; @@ -69,7 +69,7 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 2; ++use Test::More tests => 1; use lib 't/lib/merge'; { @@ -85,11 +85,11 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 9; ++use Test::More tests => 7; use lib 't/lib/runtime'; - sub use_ok_warnings { -@@ -44,4 +44,3 @@ is(scalar(grep { ref($_) eq 'ARRAY' && @ + use Module::Runtime 'require_module'; +@@ -46,4 +46,3 @@ is(scalar(grep { ref($_) eq 'ARRAY' && @ 1, "only installed one \@INC hook"); @@ -101,7 +101,7 @@ use strict; use warnings; -use Test::More; -+use Test::More tests => 2; ++use Test::More tests => 1; use lib 't/lib/warn'; { @@ -114,7 +114,7 @@ +++ xt/release/no-tabs.t @@ -3,7 +3,7 @@ use warnings; - # this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.05 + # this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.06 -use Test::More 0.88; +use Test::More tests => 1; diff --git a/perl-Dist-CheckConflicts.spec b/perl-Dist-CheckConflicts.spec index 640e8d1..24630eb 100644 --- a/perl-Dist-CheckConflicts.spec +++ b/perl-Dist-CheckConflicts.spec @@ -2,14 +2,14 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Dist-CheckConflicts -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Declare version conflicts for your dist Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Dist-CheckConflicts/ Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Dist-CheckConflicts-%{version}.tar.gz -Patch0: Dist-CheckConflicts-0.10-old-Test::More.patch +Patch0: Dist-CheckConflicts-0.11-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # Module Build @@ -18,7 +18,6 @@ BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 BuildRequires: perl(base) BuildRequires: perl(Carp) BuildRequires: perl(Exporter) -BuildRequires: perl(List::MoreUtils) >= 0.12 BuildRequires: perl(Module::Runtime) >= 0.009 BuildRequires: perl(strict) BuildRequires: perl(warnings) @@ -30,11 +29,13 @@ BuildRequires: perl(lib) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) >= 0.47 # Extra Tests +%if 0%{?fedora} BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) +%endif # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -76,7 +77,9 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \; %check make test +%if 0%{?fedora} make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" +%endif %clean rm -rf %{buildroot} @@ -87,6 +90,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Dist::CheckConflicts.3pm* %changelog +* Thu Apr 3 2014 Paul Howarth - 0.11-1 +- Update to 0.11 + - Drop the dep on List::MoreUtils + (https://github.com/doy/dist-checkconflicts/pull/8) +- Update patch for building with Test::More < 0.88 +- Don't try to run the extra tests for EPEL builds + * Wed Dec 18 2013 Paul Howarth - 0.10-1 - Update to 0.10 - We need Module::Runtime 0.009 for module_notional_filename (#6) diff --git a/sources b/sources index 3e056a5..d376d6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -421fd89a8f888d2a3411754da1c384a8 Dist-CheckConflicts-0.10.tar.gz +c8725a92b9169708b0f63036812070f2 Dist-CheckConflicts-0.11.tar.gz