Update to 0.11

- New upstream release 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
This commit is contained in:
Paul Howarth 2014-04-03 20:52:35 +01:00
parent 17e8e2459a
commit aa43b7dc4f
3 changed files with 24 additions and 14 deletions

View File

@ -5,7 +5,7 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 4; +use Test::More tests => 2;
use Test::Fatal; use Test::Fatal;
use lib 't/lib/also'; use lib 't/lib/also';
@ -21,7 +21,7 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 6; +use Test::More tests => 4;
use lib 't/lib/basic'; use lib 't/lib/basic';
{ {
@ -37,7 +37,7 @@
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 17; +use Test::More tests => 12;
use Test::Fatal; use Test::Fatal;
use lib 't/lib/conflicts'; use lib 't/lib/conflicts';
@ -53,7 +53,7 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 16; +use Test::More tests => 12;
use Test::Fatal; use Test::Fatal;
use lib 't/lib/dist'; use lib 't/lib/dist';
@ -69,7 +69,7 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 2; +use Test::More tests => 1;
use lib 't/lib/merge'; use lib 't/lib/merge';
{ {
@ -85,11 +85,11 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 9; +use Test::More tests => 7;
use lib 't/lib/runtime'; use lib 't/lib/runtime';
sub use_ok_warnings { use Module::Runtime 'require_module';
@@ -44,4 +44,3 @@ is(scalar(grep { ref($_) eq 'ARRAY' && @ @@ -46,4 +46,3 @@ is(scalar(grep { ref($_) eq 'ARRAY' && @
1, 1,
"only installed one \@INC hook"); "only installed one \@INC hook");
@ -101,7 +101,7 @@
use strict; use strict;
use warnings; use warnings;
-use Test::More; -use Test::More;
+use Test::More tests => 2; +use Test::More tests => 1;
use lib 't/lib/warn'; use lib 't/lib/warn';
{ {
@ -114,7 +114,7 @@
+++ xt/release/no-tabs.t +++ xt/release/no-tabs.t
@@ -3,7 +3,7 @@ use warnings; @@ -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 0.88;
+use Test::More tests => 1; +use Test::More tests => 1;

View File

@ -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) %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 Name: perl-Dist-CheckConflicts
Version: 0.10 Version: 0.11
Release: 1%{?dist} Release: 1%{?dist}
Summary: Declare version conflicts for your dist Summary: Declare version conflicts for your dist
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Dist-CheckConflicts/ URL: http://search.cpan.org/dist/Dist-CheckConflicts/
Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Dist-CheckConflicts-%{version}.tar.gz 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch BuildArch: noarch
# Module Build # Module Build
@ -18,7 +18,6 @@ BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
BuildRequires: perl(base) BuildRequires: perl(base)
BuildRequires: perl(Carp) BuildRequires: perl(Carp)
BuildRequires: perl(Exporter) BuildRequires: perl(Exporter)
BuildRequires: perl(List::MoreUtils) >= 0.12
BuildRequires: perl(Module::Runtime) >= 0.009 BuildRequires: perl(Module::Runtime) >= 0.009
BuildRequires: perl(strict) BuildRequires: perl(strict)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
@ -30,11 +29,13 @@ BuildRequires: perl(lib)
BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(Test::More) >= 0.47
# Extra Tests # Extra Tests
%if 0%{?fedora}
BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Pod::Coverage::TrustPod)
BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::EOL)
BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Pod::Coverage)
%endif
# Runtime # Runtime
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@ -76,7 +77,9 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
%check %check
make test make test
%if 0%{?fedora}
make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
%endif
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -87,6 +90,13 @@ rm -rf %{buildroot}
%{_mandir}/man3/Dist::CheckConflicts.3pm* %{_mandir}/man3/Dist::CheckConflicts.3pm*
%changelog %changelog
* Thu Apr 3 2014 Paul Howarth <paul@city-fan.org> - 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 <paul@city-fan.org> - 0.10-1 * Wed Dec 18 2013 Paul Howarth <paul@city-fan.org> - 0.10-1
- Update to 0.10 - Update to 0.10
- We need Module::Runtime 0.009 for module_notional_filename (#6) - We need Module::Runtime 0.009 for module_notional_filename (#6)

View File

@ -1 +1 @@
421fd89a8f888d2a3411754da1c384a8 Dist-CheckConflicts-0.10.tar.gz c8725a92b9169708b0f63036812070f2 Dist-CheckConflicts-0.11.tar.gz