diff --git a/Test-Synopsis-0.15-Whitelist-Mengu-for-spell-checker.patch b/Test-Synopsis-0.15-Whitelist-Mengu-for-spell-checker.patch deleted file mode 100644 index a3e8c88..0000000 --- a/Test-Synopsis-0.15-Whitelist-Mengu-for-spell-checker.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cf4a5f17e1fdece8a28d256ef9b5c0689cb40f10 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 24 May 2019 10:28:31 +0200 -Subject: [PATCH] =?UTF-8?q?Whitelist=20Mengu=C3=A9=20for=20spell=20checker?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After upgrading Test-Spelling from 0.22 to 0.23 a new error emrged: - - not ok 1 - POD spelling for lib/Test/Synopsis.pm - # Failed test 'POD spelling for lib/Test/Synopsis.pm' - # at xt/author/pod-spell.t line 11. - # Errors: - # Mengu - # - # All incorrect words, by number of occurrences: - # 1: Mengu - # Looks like you failed 1 test of 1. - -This patch adds Mengué to the stopwords. - -Signed-off-by: Petr Písař ---- - lib/Test/Synopsis.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Test/Synopsis.pm b/lib/Test/Synopsis.pm -index 2e69d14..5abbae6 100644 ---- a/lib/Test/Synopsis.pm -+++ b/lib/Test/Synopsis.pm -@@ -168,6 +168,7 @@ __END__ - - =for stopwords Goro blogged Znet Zoffix DOHERTY Doherty - KRYDE Ryde ZOFFIX Gr nauer Grünauer pm HEREDOC HEREDOCs DROLSKY -+ Mengué - - =for test_synopsis $main::for_checked=1 - --- -2.20.1 - diff --git a/Test-Synopsis-0.15-spelling.patch b/Test-Synopsis-0.15-spelling.patch new file mode 100644 index 0000000..90013a9 --- /dev/null +++ b/Test-Synopsis-0.15-spelling.patch @@ -0,0 +1,9 @@ +--- xt/author/pod-spell.t ++++ xt/author/pod-spell.t +@@ -1,5 +1,6 @@ + use strict; + use warnings; ++use utf8; + use Test::More; + + # generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007000 diff --git a/perl-Test-Synopsis.spec b/perl-Test-Synopsis.spec index 930303b..d90b2af 100644 --- a/perl-Test-Synopsis.spec +++ b/perl-Test-Synopsis.spec @@ -3,21 +3,19 @@ Name: perl-Test-Synopsis Version: 0.15 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Test your SYNOPSIS code License: GPL+ or Artistic URL: https://metacpan.org/release/Test-Synopsis -Source0: https://cpan.metacpan.org/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-%{version}.tar.gz -# Correct a spelling test, bug #1713565, -# -Patch0: Test-Synopsis-0.15-Whitelist-Mengu-for-spell-checker.patch +Source0: https://cpan.metacpan.org/modules/by-module/Test/Test-Synopsis-%{version}.tar.gz +Patch0: Test-Synopsis-0.15-spelling.patch BuildArch: noarch # Module Build BuildRequires: coreutils BuildRequires: findutils BuildRequires: make -BuildRequires: perl-interpreter BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(ExtUtils::MakeMaker) # Module Runtime BuildRequires: perl(ExtUtils::Manifest) @@ -51,8 +49,9 @@ BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Pod) >= 1.41 BuildRequires: perl(Test::Pod::Coverage) >= 1.08 BuildRequires: perl(Test::Portability::Files) -BuildRequires: perl(Test::Spelling), hunspell-en +BuildRequires: perl(Test::Spelling) >= 0.23, hunspell-en BuildRequires: perl(Test::Version) +BuildRequires: perl(utf8) %endif # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -68,17 +67,19 @@ sub) and doesn't actually run the code. %prep %setup -q -n Test-Synopsis-%{version} -%patch0 -p1 + +# Fix FTBFS with Test-Spelling 0.23 +# https://github.com/genio/test-spelling/pull/10 +%patch0 %build perl Makefile.PL INSTALLDIRS=vendor 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 @@ -97,6 +98,9 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" %{_mandir}/man3/Test::Synopsis.3* %changelog +* Fri May 24 2019 aul Howarth - 0.15-14 +- Simpler fix for FTBFS with Test::Spelling 0.23 (#1713565) + * Fri May 24 2019 Petr Pisar - 0.15-13 - Correct a spelling test (bug #1713565)