commit b6227aa6237acbc02c114b93a4fd310a4876d21b Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Mon Jan 20 18:51:24 2014 +0000 Update to 0.9 - New upstream release 0.9 - More consistent UTF-8 naming in docs - Dist::Zilla maintenance - Fixed shebang in scan_mojibake (https://github.com/creaktive/Test-Mojibake/issues/7) - Update patch for building with old Test::More versions ...patch => Test-Mojibake-0.9-old-Test::More.patch | 62 +++++++++++++------- perl-Test-Mojibake.spec | 30 ++++----- sources | 2 +- 3 files changed, 55 insertions(+), 39 deletions(-) --- diff --git a/Test-Mojibake-0.8-old-Test::More.patch b/Test-Mojibake-0.9-old-Test::More.patch similarity index 51% rename from Test-Mojibake-0.8-old-Test::More.patch rename to Test-Mojibake-0.9-old-Test::More.patch index e604ff0..17c7b46 100644 --- a/Test-Mojibake-0.8-old-Test::More.patch +++ b/Test-Mojibake-0.9-old-Test::More.patch @@ -1,6 +1,5 @@ -diff -up Test-Mojibake-0.8/t/06-pp-vs-xs.t.orig Test-Mojibake-0.8/t/06-pp-vs-xs.t ---- Test-Mojibake-0.8/t/06-pp-vs-xs.t.orig 2013-01-26 20:28:12.000000000 +0000 -+++ Test-Mojibake-0.8/t/06-pp-vs-xs.t 2013-01-26 22:17:47.038813730 +0000 +--- t/06-pp-vs-xs.t ++++ t/06-pp-vs-xs.t @@ -2,7 +2,7 @@ use strict; use warnings qw(all); @@ -27,9 +26,8 @@ diff -up Test-Mojibake-0.8/t/06-pp-vs-xs.t.orig Test-Mojibake-0.8/t/06-pp-vs-xs. sub run { my $i = 0; for (@buf) { -diff -up Test-Mojibake-0.8/t/07-broken-utf8.t.orig Test-Mojibake-0.8/t/07-broken-utf8.t ---- Test-Mojibake-0.8/t/07-broken-utf8.t.orig 2013-01-26 20:28:12.000000000 +0000 -+++ Test-Mojibake-0.8/t/07-broken-utf8.t 2013-01-26 22:17:47.038813730 +0000 +--- t/07-broken-utf8.t ++++ t/07-broken-utf8.t @@ -27,7 +27,7 @@ my @tests = ( ["11-overlong-5" => 0 => \"\xfc\x80\x80\x80\x80\xaf"], ); @@ -40,10 +38,9 @@ diff -up Test-Mojibake-0.8/t/07-broken-utf8.t.orig Test-Mojibake-0.8/t/07-broken for @tests; - -done_testing(scalar @tests); -diff -up Test-Mojibake-0.8/t/release-cpan-changes.t.orig Test-Mojibake-0.8/t/release-cpan-changes.t ---- Test-Mojibake-0.8/t/release-cpan-changes.t.orig 2013-01-26 20:28:12.000000000 +0000 -+++ Test-Mojibake-0.8/t/release-cpan-changes.t 2013-01-26 22:17:47.038813730 +0000 -@@ -1,15 +1,11 @@ +--- t/release-cpan-changes.t ++++ t/release-cpan-changes.t +@@ -1,19 +1,17 @@ #!perl +use Test::More; @@ -56,22 +53,45 @@ diff -up Test-Mojibake-0.8/t/release-cpan-changes.t.orig Test-Mojibake-0.8/t/rel + plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING}); + eval 'use Test::CPAN::Changes'; + plan skip_all => 'Test::CPAN::Changes required for this test' if $@; ++ plan tests => 5; } -- --use Test::More; --eval 'use Test::CPAN::Changes'; --plan skip_all => 'Test::CPAN::Changes required for this test' if $@; - changes_ok(); + + use strict; + use warnings; + +-use Test::More 0.96 tests => 2; + use_ok('Test::CPAN::Changes'); +-subtest 'changes_ok' => sub { +- changes_file_ok('Changes'); +-}; -done_testing(); -diff -up Test-Mojibake-0.8/t/release-test-version.t.orig Test-Mojibake-0.8/t/release-test-version.t ---- Test-Mojibake-0.8/t/release-test-version.t.orig 2013-01-26 22:17:47.000000000 +0000 -+++ Test-Mojibake-0.8/t/release-test-version.t 2013-01-26 22:18:26.069722569 +0000 -@@ -26,5 +26,6 @@ push @imports, $params ++changes_file_ok('Changes'); +--- t/release-no-tabs.t ++++ t/release-no-tabs.t +@@ -11,7 +11,7 @@ use warnings; - Test::Version->import(@imports); + # this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.06 + +-use Test::More 0.88; ++use Test::More tests => 2; + use Test::NoTabs; + + my @files = ( +@@ -20,4 +20,3 @@ my @files = ( + ); + + notabs_ok($_) foreach @files; +-done_testing; +--- t/release-test-version.t ++++ t/release-test-version.t +@@ -23,8 +23,8 @@ my $params = { + push @imports, $params + if version->parse( $Test::Version::VERSION ) >= version->parse('1.002'); +plan tests => 2; -+ + + Test::Version->import(@imports); + version_all_ok(); -done_testing; diff --git a/perl-Test-Mojibake.spec b/perl-Test-Mojibake.spec index b5ead7a..eb08224 100644 --- a/perl-Test-Mojibake.spec +++ b/perl-Test-Mojibake.spec @@ -1,22 +1,19 @@ # We need to patch the test suite if we have an old version of Test::More -%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) - -# PPI can't handle the unicode byte order mark in t/bom.pl prior to version 1.204_02 -%global old_ppi %(perl -MPPI -e 'print (($PPI::VERSION < 1.204_02) ? 1 : 0);' 2>/dev/null || echo 0) +%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.96) ? 1 : 0);' 2>/dev/null || echo 0) # noarch, but to avoid debug* files interfering with manifest test: %global debug_package %{nil} Name: perl-Test-Mojibake -Version: 0.8 -Release: 4%{?dist} +Version: 0.9 +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-0.4-no-Test::Version.patch -Patch1: Test-Mojibake-0.8-old-Test::More.patch +Patch1: Test-Mojibake-0.9-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # =================================================================== @@ -120,7 +117,7 @@ Enter the Test::Mojibake ;) # We need to patch the test suite if we have an old version of Test::More %if %{old_test_more} -%patch1 -p1 +%patch1 %endif %build @@ -134,16 +131,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \; %{_fixperms} %{buildroot} %check -# PPI can't handle the unicode byte order mark in t/bom.pl prior to version 1.204_02 -%if %{old_ppi} -mv t/release-minimum-version.t ./ -sed -i -e 's|t/release-minimum-version.t|release-minimum-version.t|' MANIFEST -%endif make test %{!?perl_bootstrap:AUTHOR_TESTING=1 RELEASE_TESTING=1} -%if %{old_ppi} -mv ./release-minimum-version.t t/ -sed -i -e 's|release-minimum-version.t|t/release-minimum-version.t|' MANIFEST -%endif %clean rm -rf %{buildroot} @@ -156,6 +144,14 @@ rm -rf %{buildroot} %{_mandir}/man3/Test::Mojibake.3pm* %changelog +* Mon Jan 20 2014 Paul Howarth <paul@xxxxxxxxxxxx> - 0.9-1 +- Update to 0.9 + - More consistent UTF-8 naming in docs + - Dist::Zilla maintenance + - Fixed shebang in scan_mojibake + (https://github.com/creaktive/Test-Mojibake/issues/7) +- Update patch for building with old Test::More versions + * Wed Aug 14 2013 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.8-4 - Perl 5.18 re-rebuild of bootstrapped packages diff --git a/sources b/sources index bd89081..071e7d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0baa9275af39fa7f60c62b5b2b3110bd Test-Mojibake-0.8.tar.gz +4a6219386553674efb25b611ebb48f1c Test-Mojibake-0.9.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