commit 2588498a3f9897ffc0e28075111fdd61e0514ce4
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Wed Jul 10 16:11:51 2013 +0100
Update to 0.08
- New upstream release 0.08
- Instead of silently ignoring conflicts that do not compile, issue a
conflict warning (CPAN RT#75486)
- BR: perl(Module::Runtime)
- Classify buildreqs by usage
- Explicitly run the extra tests
...> Dist-CheckConflicts-0.08-old-Test::More.patch | 103 +++++++++++---------
perl-Dist-CheckConflicts.spec | 33 +++++--
sources | 2 +-
3 files changed, 83 insertions(+), 55 deletions(-)
---
diff --git a/Dist-CheckConflicts-0.06-old-Test::More.patch b/Dist-CheckConflicts-0.08-old-Test::More.patch
similarity index 54%
rename from Dist-CheckConflicts-0.06-old-Test::More.patch
rename to Dist-CheckConflicts-0.08-old-Test::More.patch
index 96a6534..56e2a8b 100644
--- a/Dist-CheckConflicts-0.06-old-Test::More.patch
+++ b/Dist-CheckConflicts-0.08-old-Test::More.patch
@@ -1,97 +1,92 @@
---- t/01-basic.t
-+++ t/01-basic.t
+--- t/also.t
++++ t/also.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
-+use Test::More tests => 6;
- use lib 't/lib/01';
++use Test::More tests => 4;
+ use Test::Fatal;
+ use lib 't/lib/also';
- {
-@@ -43,5 +43,3 @@ use lib 't/lib/01';
- "nested conflicts work"
+@@ -29,4 +29,3 @@ use lib 't/lib/also';
);
}
--
+
-done_testing;
---- t/02-conflicts.t
-+++ t/02-conflicts.t
+--- t/basic.t
++++ t/basic.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
-+use Test::More tests => 12;
- use Test::Fatal;
- use lib 't/lib/02';
++use Test::More tests => 6;
+ use lib 't/lib/basic';
-@@ -68,5 +68,3 @@ use lib 't/lib/02';
- "correct conflict error"
+ {
+@@ -44,4 +44,3 @@ use lib 't/lib/basic';
);
}
--
+
-done_testing;
---- t/03-dist.t
-+++ t/03-dist.t
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
+--- t/conflicts.t
++++ t/conflicts.t
+@@ -2,7 +2,7 @@
use strict;
use warnings;
+
-use Test::More;
-+use Test::More tests => 16;
++use Test::More tests => 17;
use Test::Fatal;
- use lib 't/lib/03';
+ use lib 't/lib/conflicts';
-@@ -72,5 +72,3 @@ use lib 't/lib/03';
- );
- is(Bar::Conflicts::Bad->dist, 'Bar', "correct dist");
+@@ -109,4 +109,3 @@ use lib 't/lib/conflicts';
+ ;
}
--
+
-done_testing;
---- t/04-merge.t
-+++ t/04-merge.t
+--- t/dist.t
++++ t/dist.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
-+use Test::More tests => 2;
- use lib 't/lib/04';
++use Test::More tests => 16;
+ use Test::Fatal;
+ use lib 't/lib/dist';
- {
-@@ -17,5 +17,3 @@ use lib 't/lib/04';
- "got the right conflicts"
- );
+@@ -73,4 +73,3 @@ use lib 't/lib/dist';
+ is(Bar::Conflicts::Bad->dist, 'Bar', "correct dist");
}
--
+
-done_testing;
---- t/05-also.t
-+++ t/05-also.t
+--- t/merge.t
++++ t/merge.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
-+use Test::More tests => 4;
- use Test::Fatal;
- use lib 't/lib/05';
++use Test::More tests => 2;
+ use lib 't/lib/merge';
-@@ -28,5 +28,3 @@ use lib 't/lib/05';
- "unknown also entries are ignored"
+ {
+@@ -18,4 +18,3 @@ use lib 't/lib/merge';
);
}
--
+
-done_testing;
---- t/06-runtime.t
-+++ t/06-runtime.t
+--- t/runtime.t
++++ t/runtime.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More tests => 9;
- use lib 't/lib/06';
+ use lib 't/lib/runtime';
sub use_ok_warnings {
@@ -44,4 +44,3 @@ is(scalar(grep { ref($_) eq 'ARRAY' && @
@@ -99,3 +94,19 @@
"only installed one \@INC hook");
-done_testing;
+--- t/warn.t
++++ t/warn.t
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 2;
+ use lib 't/lib/warn';
+
+ {
+@@ -13,4 +13,3 @@ use lib 't/lib/warn';
+ is($warning, '', "we don't see warnings from loaded modules");
+ }
+
+-done_testing;
diff --git a/perl-Dist-CheckConflicts.spec b/perl-Dist-CheckConflicts.spec
index 89dfcb8..38ac813 100644
--- a/perl-Dist-CheckConflicts.spec
+++ b/perl-Dist-CheckConflicts.spec
@@ -2,31 +2,39 @@
%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.06
+Version: 0.08
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
-Patch1: Dist-CheckConflicts-0.06-old-Test::More.patch
+Patch0: Dist-CheckConflicts-0.08-old-Test::More.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
+# Module Build
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
+# Module
BuildRequires: perl(base)
BuildRequires: perl(Carp)
BuildRequires: perl(Exporter)
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(List::MoreUtils) >= 0.12
+BuildRequires: perl(Module::Runtime)
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
+# Test Suite
BuildRequires: perl(File::Find)
BuildRequires: perl(File::Temp)
BuildRequires: perl(lib)
-BuildRequires: perl(List::MoreUtils) >= 0.12
+BuildRequires: perl(Test::Fatal)
+BuildRequires: perl(Test::More) >= 0.47
+# Extra Tests
BuildRequires: perl(Pod::Coverage::TrustPod)
BuildRequires: perl(Test::EOL)
-BuildRequires: perl(Test::Fatal)
-BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
+# Runtime
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
@@ -52,7 +60,7 @@ this manually.
# Test suite needs patching if we have Test::More < 0.88
%if %{old_test_more}
-%patch1
+%patch0
%endif
%build
@@ -66,7 +74,8 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
%{_fixperms} %{buildroot}
%check
-make test RELEASE_TESTING=1
+make test
+make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
%clean
rm -rf %{buildroot}
@@ -78,6 +87,14 @@ rm -rf %{buildroot}
%{_mandir}/man3/Dist::CheckConflicts.3pm*
%changelog
+* Wed Jul 10 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 0.08-1
+- Update to 0.08
+ - Instead of silently ignoring conflicts that do not compile, issue a
+ conflict warning (CPAN RT#75486)
+- BR: perl(Module::Runtime)
+- Classify buildreqs by usage
+- Explicitly run the extra tests
+
* Sat Jun 22 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 0.06-1
- Update to 0.06
- Add optional runtime conflict warnings
diff --git a/sources b/sources
index 8cc3cab..ef0d478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-510193204fb24e24779e86b490b2d713 Dist-CheckConflicts-0.06.tar.gz
+e6cf4dfe8c228e8cf814b52d49dd66e4 Dist-CheckConflicts-0.08.tar.gz
--
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
