[perl-Pod-Wordlist-hanekomu] Update to 1.132680

Paul Howarth pghmcfc at fedoraproject.org
Thu Sep 26 15:52:11 UTC 2013


commit 82531a392d141ab127d37547868dcb4814bc7a75
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Sep 26 16:51:10 2013 +0100

    Update to 1.132680
    
    - New upstream release 1.132680
      - Marked as deprecated now that words are merged into Pod::Wordlist
    - Classify buildreqs by usage
    - Update patches as needed
    - Add further patch to support building with Pod::Wordlist < 1.06

 ...list-hanekomu-1.122840-old-Test::Spelling.patch |   11 -----
 ...hanekomu-1.132680-Test::More-done_testing.patch |   30 ++++++++++---
 ...list-hanekomu-1.132680-old-Test::Spelling.patch |   11 +++++
 Pod-Wordlist-hanekomu-1.132680-stopwords.patch     |   15 ++++++
 perl-Pod-Wordlist-hanekomu.spec                    |   46 +++++++++++++++-----
 sources                                            |    2 +-
 6 files changed, 85 insertions(+), 30 deletions(-)
---
diff --git a/Pod-Wordlist-hanekomu-1.121370-Test::More-done_testing.patch b/Pod-Wordlist-hanekomu-1.132680-Test::More-done_testing.patch
similarity index 57%
rename from Pod-Wordlist-hanekomu-1.121370-Test::More-done_testing.patch
rename to Pod-Wordlist-hanekomu-1.132680-Test::More-done_testing.patch
index 482108b..a51caae 100644
--- a/Pod-Wordlist-hanekomu-1.121370-Test::More-done_testing.patch
+++ b/Pod-Wordlist-hanekomu-1.132680-Test::More-done_testing.patch
@@ -1,12 +1,11 @@
-diff -up Pod-Wordlist-hanekomu-1.113620/t/000-report-versions.t.orig Pod-Wordlist-hanekomu-1.113620/t/000-report-versions.t
---- Pod-Wordlist-hanekomu-1.113620/t/000-report-versions.t.orig	2011-12-28 23:53:47.678480021 +0000
-+++ Pod-Wordlist-hanekomu-1.113620/t/000-report-versions.t	2011-12-28 23:53:47.681480023 +0000
+--- t/000-report-versions.t
++++ t/000-report-versions.t
 @@ -1,7 +1,7 @@
  #!perl
  use warnings;
  use strict;
 -use Test::More 0.88;
-+use Test::More tests => 10;
++use Test::More tests => 11;
  
  # Include a cut-down version of YAML::Tiny so we don't introduce unnecessary
  # dependencies ourselves.
@@ -16,9 +15,8 @@ diff -up Pod-Wordlist-hanekomu-1.113620/t/000-report-versions.t.orig Pod-Wordlis
      }
 -    done_testing;
  }
-diff -up Pod-Wordlist-hanekomu-1.113620/t/release-check-changes.t.orig Pod-Wordlist-hanekomu-1.113620/t/release-check-changes.t
---- Pod-Wordlist-hanekomu-1.113620/t/release-check-changes.t.orig	2011-12-28 21:25:28.000000000 +0000
-+++ Pod-Wordlist-hanekomu-1.113620/t/release-check-changes.t	2011-12-28 23:53:47.699480030 +0000
+--- t/release-check-changes.t
++++ t/release-check-changes.t
 @@ -1,16 +1,13 @@
  #!perl
  
@@ -42,3 +40,21 @@ diff -up Pod-Wordlist-hanekomu-1.113620/t/release-check-changes.t.orig Pod-Wordl
 -plan skip_all => "Test::CheckChanges required for testing changes"
 -  if $@;
  ok_changes();
+--- t/release-no-tabs.t
++++ t/release-no-tabs.t
+@@ -11,12 +11,13 @@ use warnings;
+ 
+ # this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.02
+ 
+-use Test::More 0.88;
++use Test::More;
+ use Test::NoTabs;
+ 
+ my @files = (
+     'lib/Pod/Wordlist/hanekomu.pm'
+ );
+ 
++plan tests => scalar @files;
++
+ notabs_ok($_) foreach @files;
+-done_testing;
diff --git a/Pod-Wordlist-hanekomu-1.132680-old-Test::Spelling.patch b/Pod-Wordlist-hanekomu-1.132680-old-Test::Spelling.patch
new file mode 100644
index 0000000..1cf459d
--- /dev/null
+++ b/Pod-Wordlist-hanekomu-1.132680-old-Test::Spelling.patch
@@ -0,0 +1,11 @@
+--- t/author-pod-spell.t
++++ t/author-pod-spell.t
+@@ -11,7 +11,7 @@
+ use Test::More;
+ 
+ # generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006001
+-use Test::Spelling 0.12;
++use Test::Spelling 0.11;
+ use Pod::Wordlist::hanekomu;
+ 
+ 
diff --git a/Pod-Wordlist-hanekomu-1.132680-stopwords.patch b/Pod-Wordlist-hanekomu-1.132680-stopwords.patch
new file mode 100644
index 0000000..10dced9
--- /dev/null
+++ b/Pod-Wordlist-hanekomu-1.132680-stopwords.patch
@@ -0,0 +1,15 @@
+Words from Pod::Wordlist::hanekomu were merged into Pod::Wordlist
+at Pod::Wordlist 1.06; if we have an older version of Pod::Wordlist,
+we'll need to use Pod::Wordlist::hanekomu instead.
+
+--- t/author-pod-spell.t
++++ t/author-pod-spell.t
+@@ -12,7 +12,7 @@
+ 
+ # generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006001
+ use Test::Spelling 0.12;
+-use Pod::Wordlist;
++use Pod::Wordlist::hanekomu;
+ 
+ 
+ add_stopwords(<DATA>);
diff --git a/perl-Pod-Wordlist-hanekomu.spec b/perl-Pod-Wordlist-hanekomu.spec
index 5d08f8e..26e9cc2 100644
--- a/perl-Pod-Wordlist-hanekomu.spec
+++ b/perl-Pod-Wordlist-hanekomu.spec
@@ -3,36 +3,46 @@
 %global older_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
 %global even_older_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.82) ? 1 : 0);' 2>/dev/null || echo 0)
 %global old_test_spelling %(perl -MTest::Spelling -e 'print (($Test::Spelling::VERSION < 0.12) ? 1 : 0);' 2>/dev/null || echo 0)
+%global old_pod_wordlist %(perl -MPod::Wordlist -e 'print (($Pod::Wordlist::VERSION < 1.06) ? 1 : 0);' 2>/dev/null || echo 0)
 
 # noarch, but to avoid debug* files interfering with manifest test:
 %global debug_package %{nil}
 
 Name:		perl-Pod-Wordlist-hanekomu
-Version:	1.130240
-Release:	4%{?dist}
+Version:	1.132680
+Release:	1%{?dist}
 Summary:	Add words for spell checking POD
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		https://metacpan.org/module/Pod::Wordlist::hanekomu/
 Source0:	http://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Pod-Wordlist-hanekomu-%{version}.tar.gz
+Patch0:		Pod-Wordlist-hanekomu-1.132680-stopwords.patch
 Patch1:		Pod-Wordlist-hanekomu-1.110090-Test::More-version.patch
-Patch2:		Pod-Wordlist-hanekomu-1.121370-Test::More-done_testing.patch
+Patch2:		Pod-Wordlist-hanekomu-1.132680-Test::More-done_testing.patch
 Patch3:		Pod-Wordlist-hanekomu-1.113620-Test::More-note.patch
-Patch4:		Pod-Wordlist-hanekomu-1.122840-old-Test::Spelling.patch
+Patch4:		Pod-Wordlist-hanekomu-1.132680-old-Test::Spelling.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 # ===================================================================
+# Module Build requirements
+# ===================================================================
+BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
+# ===================================================================
 # Module requirements
 # ===================================================================
+BuildRequires:	perl(strict)
+BuildRequires:	perl(Test::Spelling), aspell-en
+BuildRequires:	perl(utf8)
+BuildRequires:	perl(warnings)
+# ===================================================================
+# Test Suite requirements
+# ===================================================================
 BuildRequires:	perl(Carp)
-BuildRequires:	perl(English)
-BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(File::Find)
-BuildRequires:	perl(File::Temp)
+BuildRequires:	perl(File::Spec)
+BuildRequires:	perl(IO::Handle)
+BuildRequires:	perl(IPC::Open3)
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Test::Spelling), aspell-en
-BuildRequires:	perl(utf8)
 # ===================================================================
 # Author/Release test requirements
 #
@@ -41,7 +51,9 @@ BuildRequires:	perl(utf8)
 # their author/release tests.
 # ===================================================================
 %if 0%{!?perl_bootstrap:1}
+BuildRequires:	perl(English)
 BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Pod::Wordlist)
 BuildRequires:	perl(Test::HasVersion)
 BuildRequires:	perl(Test::CheckChanges)
 BuildRequires:	perl(Test::CPAN::Meta)
@@ -85,13 +97,18 @@ word list (e.g. mixin, munging).
 %endif
 # done_testing requires Test::More ≥ 0.88
 %if %{older_test_more}
-%patch2 -p1
+%patch2
 %endif
 # note() requires Test::More ≥ 0.82
 %if %{even_older_test_more}
 %patch3 -p1
 %endif
 
+# Need to use our own stopwords unless we have Pod::Wordlist ≥ 1.06
+%if %{old_pod_wordlist}
+%patch0
+%endif
+
 # Don't really need Test::Spelling ≥ 0.12
 %if %{old_test_spelling}
 %patch4
@@ -119,6 +136,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Pod::Wordlist::hanekomu.3pm*
 
 %changelog
+* Thu Sep 26 2013 Paul Howarth <paul at city-fan.org> - 1.132680-1
+- Update to 1.132680
+  - Marked as deprecated now that words are merged into Pod::Wordlist
+- Classify buildreqs by usage
+- Update patches as needed
+- Add further patch to support building with Pod::Wordlist < 1.06
+
 * Wed Aug 14 2013 Jitka Plesnikova <jplesnik at redhat.com> - 1.130240-4
 - Perl 5.18 re-rebuild of bootstrapped packages
 
diff --git a/sources b/sources
index cd94547..805c60e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3733ea9459b33b647ed33643eaa69b3  Pod-Wordlist-hanekomu-1.130240.tar.gz
+e890599c15f0beaac5460e8586885247  Pod-Wordlist-hanekomu-1.132680.tar.gz


More information about the scm-commits mailing list