Update to 1.3

- New upstream release 1.3
  - Minor fixes to pass the release tests
  - Add MetaJSON plugin (GH#12)
  - Add new optional dependency on Unicode::CheckUTF8::PP, a Pure Perl
    implementation of Unicode::CheckUTF8
  - Fixed off-by-one (GH#10)
  - Fixed SYNOPSIS
- Work around bug in GNU tar 1.15.1 that breaks extracting tarballs made with
  unknown extended attributes on old distributions
- Drop EL-5 build support
- Update patches as needed
This commit is contained in:
Paul Howarth 2017-02-06 21:21:02 +00:00
parent 0381374dc6
commit d1c62ef594
8 changed files with 96 additions and 104 deletions

View File

@ -1,11 +0,0 @@
--- t/release-pod-syntax.t
+++ t/release-pod-syntax.t
@@ -9,6 +9,7 @@ BEGIN {
# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
use Test::More;
-use Test::Pod 1.41;
+eval "use Test::Pod 1.41";
+plan skip_all => "Test::Pod 1.41 required for testing POD" if $@;
all_pod_files_ok();

View File

@ -1,18 +0,0 @@
--- t/author-test-version.t
+++ t/author-test-version.t
@@ -11,7 +11,8 @@
use Test::More;
# generated by Dist::Zilla::Plugin::Test::Version 1.05
-use Test::Version;
+eval 'use Test::Version';
+plan skip_all => 'Test::Version required' if $@;
my @imports = qw( version_all_ok );
@@ -30,4 +31,4 @@
plan tests => 2;
-version_all_ok;
+version_all_ok();

View File

@ -1,13 +0,0 @@
--- lib/Test/Mojibake.pm
+++ lib/Test/Mojibake.pm
@@ -318,8 +318,8 @@ version 1.1
# Test::Mojibake lets you check for inconsistencies in source/documentation encoding, and report its results in standard Test::Simple fashion.
use Test::Mojibake;
- file_encoding_ok($file, 'Valid encoding');
- done_testing($num_tests);
+ file_encoding_ok('test.pl', 'Valid encoding');
+ done_testing();
=head1 DESCRIPTION

View File

@ -0,0 +1,28 @@
--- t/author-test-version.t
+++ t/author-test-version.t
@@ -4,6 +4,11 @@ BEGIN {
print qq{1..0 # SKIP these tests are for testing by the author\n};
exit
}
+ eval 'use Test::Version';
+ if ($@) {
+ print qq{1..0 # SKIP Test::Version required\n};
+ exit
+ }
}
use strict;
@@ -11,7 +16,6 @@ use warnings;
use Test::More;
# generated by Dist::Zilla::Plugin::Test::Version 1.09
-use Test::Version;
my @imports = qw( version_all_ok );
@@ -29,4 +33,4 @@ Test::Version->import(@imports);
plan tests => 2;
-version_all_ok;
+version_all_ok();

View File

@ -42,14 +42,14 @@
+++ t/author-eol.t
@@ -11,7 +11,7 @@ use warnings;
# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.18
# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.19
-use Test::More 0.88;
+use Test::More;
use Test::EOL;
my @files = (
@@ -65,5 +65,6 @@ my @files = (
@@ -66,5 +66,6 @@ my @files = (
't/release-unused-vars.t'
);
@ -68,7 +68,7 @@
use Test::NoTabs;
my @files = (
@@ -65,5 +65,6 @@ my @files = (
@@ -66,5 +66,6 @@ my @files = (
't/release-unused-vars.t'
);
@ -78,7 +78,7 @@
-done_testing;
--- t/author-test-version.t
+++ t/author-test-version.t
@@ -28,5 +28,6 @@ push @imports, $params
@@ -27,5 +27,6 @@ push @imports, $params
Test::Version->import(@imports);
@ -88,66 +88,43 @@
-done_testing;
--- t/release-cpan-changes.t
+++ t/release-cpan-changes.t
@@ -1,19 +1,17 @@
#!perl
+use Test::More;
+
BEGIN {
- unless ($ENV{RELEASE_TESTING}) {
- require Test::More;
- Test::More::plan(skip_all => 'these tests are for release candidate testing');
- }
+ plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING});
@@ -4,6 +4,11 @@ BEGIN {
print qq{1..0 # SKIP these tests are for release candidate testing\n};
exit
}
+ eval 'use Test::CPAN::Changes';
+ plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
+ plan tests => 5;
+ if ($@) {
+ print qq{1..0 # SKIP Test::CPAN::Changes required for this test\n};
+ exit
+ }
}
use strict;
use warnings;
@@ -11,8 +16,5 @@ use warnings;
-use Test::More 0.96 tests => 2;
use_ok('Test::CPAN::Changes');
# this test was generated with Dist::Zilla::Plugin::Test::CPAN::Changes 0.012
-use Test::More 0.96 tests => 1;
-use Test::CPAN::Changes;
-subtest 'changes_ok' => sub {
- changes_file_ok('Changes');
-};
-done_testing();
+use Test::More tests => 4;
+changes_file_ok('Changes');
--- t/release-kwalitee.t
+++ t/release-kwalitee.t
@@ -9,9 +9,5 @@ BEGIN {
# this test was generated with Dist::Zilla::Plugin::Test::Kwalitee 2.11
use strict;
use warnings;
-use Test::More 0.88;
-use Test::Kwalitee 1.21 'kwalitee_ok';
-
-kwalitee_ok();
-
-done_testing;
+use Test::More;
+use Test::Kwalitee;
--- t/release-unused-vars.t
+++ t/release-unused-vars.t
@@ -1,22 +1,15 @@
#!perl
+use Test::More;
+
BEGIN {
- unless ($ENV{RELEASE_TESTING}) {
- require Test::More;
- Test::More::plan(skip_all => 'these tests are for release candidate testing');
- }
+ plan(skip_all => 'these tests are for release candidate testing')
+ unless ($ENV{RELEASE_TESTING});
@@ -5,18 +5,14 @@ BEGIN {
print qq{1..0 # SKIP these tests are for release candidate testing\n};
exit
}
+ eval { require Test::Vars };
+ plan(skip_all => 'Test::Vars required for testing for unused vars')
+ if $@;
+ if ($@) {
+ print qq{1..0 # SKIP Test::Vars required for testing for unused vars\n};
+ exit
+ }
}
+use Test::More;
+Test::Vars->import;
-use Test::More 0.96 tests => 1;

View File

@ -0,0 +1,19 @@
--- t/author-pod-syntax.t
+++ t/author-pod-syntax.t
@@ -5,11 +5,15 @@ BEGIN {
print qq{1..0 # SKIP these tests are for testing by the author\n};
exit
}
+ eval "use Test::Pod 1.41";
+ if ($@) {
+ print qq{1..0 # SKIP Test::Pod 1.41 required for testing POD\n};
+ exit
+ }
}
# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
use strict; use warnings;
use Test::More;
-use Test::Pod 1.41;
all_pod_files_ok();

View File

@ -6,17 +6,16 @@
%global debug_package %{nil}
Name: perl-Test-Mojibake
Version: 1.1
Release: 5%{?dist}
Version: 1.3
Release: 1%{?dist}
Summary: Check your source for encoding misbehavior
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Test-Mojibake/
Source0: http://search.cpan.org/CPAN/authors/id/S/SY/SYP/Test-Mojibake-%{version}.tar.gz
Patch0: Test-Mojibake-1.1-synopsis.patch
Patch1: Test-Mojibake-1.1-old-Test::More.patch
Patch2: Test-Mojibake-1.0-old-Test::Pod.patch
Patch3: Test-Mojibake-1.1-no-Test::Version.patch
Patch1: Test-Mojibake-1.3-old-Test::More.patch
Patch2: Test-Mojibake-1.3-old-Test::Pod.patch
Patch3: Test-Mojibake-1.3-no-Test::Version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
# ===================================================================
@ -57,6 +56,7 @@ BuildRequires: perl(Test::Script)
%if 0%{!?perl_bootstrap:1}
BuildRequires: perl(Pod::Coverage::TrustPod)
BuildRequires: perl(Test::CPAN::Meta)
BuildRequires: perl(Test::CPAN::Meta::JSON)
BuildRequires: perl(Test::DistManifest)
BuildRequires: perl(Test::EOL)
BuildRequires: perl(Test::HasVersion)
@ -121,9 +121,6 @@ Enter the Test::Mojibake ;)
%prep
%setup -q -n Test-Mojibake-%{version}
# Make SYNOPSIS compilable perl (#1309966)
%patch0
# We need to patch the test suite if we have an old version of Test::More
%if %{old_test_more}
%patch1
@ -146,8 +143,8 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
%{_fixperms} %{buildroot}
find %{buildroot} -type f -name .packlist -delete
%{_fixperms} -c %{buildroot}
%check
make test %{!?perl_bootstrap:AUTHOR_TESTING=1 RELEASE_TESTING=1} \
@ -171,6 +168,19 @@ rm -rf %{buildroot}
%{_mandir}/man3/Test::Mojibake.3*
%changelog
* Mon Feb 6 2017 Paul Howarth <paul@city-fan.org> - 1.3-1
- Update to 1.3
- Minor fixes to pass the release tests
- Add MetaJSON plugin (GH#12)
- Add new optional dependency on Unicode::CheckUTF8::PP, a Pure Perl
implementation of Unicode::CheckUTF8
- Fixed off-by-one (GH#10)
- Fixed SYNOPSIS
- Work around bug in GNU tar 1.15.1 that breaks extracting tarballs made with
unknown extended attributes on old distributions
- Drop EL-5 build support
- Update patches as needed
* Wed May 18 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-5
- Perl 5.24 re-rebuild of bootstrapped packages

View File

@ -1 +1 @@
8e7a564723d21674c8927adb9388827c Test-Mojibake-1.1.tar.gz
SHA512 (Test-Mojibake-1.3.tar.gz) = 19122c562a6efacc2dbbe8018ca2d960cebb854af290b301387fc86687db8f41ee7a034ed8ce7239804f3dda3303e187643023265bd2449b9b0619b699e0985c