>From 65f11ad62b363659eaae7dd142adc459d8672fc7 Mon Sep 17 00:00:00 2001 From: Paul Howarth <p...@city-fan.org> Date: Mon, 11 Jan 2016 12:12:41 +0000 Subject: Update to 2.13
- New upstream release 2.13 - Win32 build support added - Update patch for using ExtUtils::PkgConfig instead of Alien::Hunspell --- Text-Hunspell-2.12-no-Alien.patch | 69 --------------------------------------- Text-Hunspell-2.13-no-Alien.patch | 68 ++++++++++++++++++++++++++++++++++++++ perl-Text-Hunspell.spec | 9 +++-- sources | 2 +- 4 files changed, 76 insertions(+), 72 deletions(-) delete mode 100644 Text-Hunspell-2.12-no-Alien.patch create mode 100644 Text-Hunspell-2.13-no-Alien.patch diff --git a/Text-Hunspell-2.12-no-Alien.patch b/Text-Hunspell-2.12-no-Alien.patch deleted file mode 100644 index 8a8207b..0000000 --- a/Text-Hunspell-2.12-no-Alien.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- Makefile.PL -+++ Makefile.PL -@@ -1,12 +1,13 @@ - # Only EU::MM 6.52+ understands CONFIGURE_REQUIRES - use ExtUtils::MakeMaker 6.52; --use Alien::Hunspell; -+use ExtUtils::PkgConfig; - - my $CC = $ENV{'CXX'} || 'c++'; - --my $shlib_location = Alien::Hunspell->libs; --my $header_location = Alien::Hunspell->cflags; -+my $shlib_location = ExtUtils::PkgConfig->libs_only_l('hunspell'); -+my $header_location = ExtUtils::PkgConfig->cflags_only_I('hunspell'); - -+if ($shlib_location ne '' && $header_location ne '') { - WriteMakefile( - NAME => 'Text::Hunspell', - VERSION_FROM => 'Hunspell.pm', -@@ -15,7 +16,7 @@ - LD => '$(CC)', - CONFIGURE_REQUIRES => { - 'ExtUtils::MakeMaker' => "6.52", -- 'Alien::Hunspell' => 0, -+ 'ExtUtils::PkgConfig' => 0, - }, - XSOPT => '-C++', - TYPEMAPS => ['perlobject.map', 'typemap'], -@@ -26,3 +27,13 @@ - keywords => [ qw(hunspell spelling spell-checker text-processing) ], - }, - ); -+} -+else { -+ # By default, ExtUtils::PkgConfig provides a verbose warning about -+ # being unable to locate the pkgconfig file and such. This adds an -+ # additional comment after that output. -+ warn "\n=========================================================\n"; -+ warn "NOTE: You may need to install the libhunspell-dev package\n"; -+ warn "(or the equivalent on your OS).\n"; -+ warn "=========================================================\n"; -+} ---- META.json -+++ META.json -@@ -33,8 +33,8 @@ - }, - "configure" : { - "requires" : { -- "Alien::Hunspell" : "0", -- "ExtUtils::MakeMaker" : "6.52" -+ "ExtUtils::MakeMaker" : "6.52", -+ "ExtUtils::PkgConfig" : "0" - } - }, - "runtime" : { ---- META.yml -+++ META.yml -@@ -5,10 +5,10 @@ - build_requires: - ExtUtils::MakeMaker: '0' - configure_requires: -- Alien::Hunspell: '0' - ExtUtils::MakeMaker: '6.52' -+ ExtUtils::PkgConfig: '0' - dynamic_config: 1 - generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.143240' - keywords: - - hunspell - - spelling diff --git a/Text-Hunspell-2.13-no-Alien.patch b/Text-Hunspell-2.13-no-Alien.patch new file mode 100644 index 0000000..dfcfbef --- /dev/null +++ b/Text-Hunspell-2.13-no-Alien.patch @@ -0,0 +1,68 @@ +--- Makefile.PL ++++ Makefile.PL +@@ -1,13 +1,14 @@ + # Only EU::MM 6.52+ understands CONFIGURE_REQUIRES + use ExtUtils::MakeMaker 6.52; +-use Alien::Hunspell; ++use ExtUtils::PkgConfig; + use Config; + + my $CC = $ENV{'CXX'} || 'c++'; + +-my $shlib_location = Alien::Hunspell->libs; +-my $header_location = Alien::Hunspell->cflags; ++my $shlib_location = ExtUtils::PkgConfig->libs_only_l('hunspell'); ++my $header_location = ExtUtils::PkgConfig->cflags_only_I('hunspell'); + ++if ($shlib_location ne '' && $header_location ne '') { + WriteMakefile( + NAME => 'Text::Hunspell', + VERSION_FROM => 'Hunspell.pm', +@@ -17,7 +18,7 @@ my $header_location = Alien::Hunspell->c + LD => '$(CC)', + CONFIGURE_REQUIRES => { + 'ExtUtils::MakeMaker' => "6.52", +- 'Alien::Hunspell' => 0, ++ 'ExtUtils::PkgConfig' => 0, + }, + XSOPT => '-C++', + TYPEMAPS => ['perlobject.map', 'typemap'], +@@ -28,3 +29,13 @@ my $header_location = Alien::Hunspell->c + keywords => [ qw(hunspell spelling spell-checker text-processing) ], + }, + ); ++} ++else { ++ # By default, ExtUtils::PkgConfig provides a verbose warning about ++ # being unable to locate the pkgconfig file and such. This adds an ++ # additional comment after that output. ++ warn "\n=========================================================\n"; ++ warn "NOTE: You may need to install the libhunspell-dev package\n"; ++ warn "(or the equivalent on your OS).\n"; ++ warn "=========================================================\n"; ++} +--- META.json ++++ META.json +@@ -33,8 +33,8 @@ + }, + "configure" : { + "requires" : { +- "Alien::Hunspell" : "0", +- "ExtUtils::MakeMaker" : "6.52" ++ "ExtUtils::MakeMaker" : "6.52", ++ "ExtUtils::PkgConfig" : "0" + } + }, + "runtime" : { +--- META.yml ++++ META.yml +@@ -5,8 +5,8 @@ author: + build_requires: + ExtUtils::MakeMaker: '0' + configure_requires: +- Alien::Hunspell: '0' + ExtUtils::MakeMaker: '6.52' ++ ExtUtils::PkgConfig: '0' + dynamic_config: 1 + generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.143240' + keywords: diff --git a/perl-Text-Hunspell.spec b/perl-Text-Hunspell.spec index d6c85f7..b7040c0 100644 --- a/perl-Text-Hunspell.spec +++ b/perl-Text-Hunspell.spec @@ -1,12 +1,12 @@ Name: perl-Text-Hunspell -Version: 2.12 +Version: 2.13 Release: 1%{?dist} Summary: Perl interface to the Hunspell library Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/text_hunspell/ Source0: http://search.cpan.org/CPAN/authors/id/C/CO/COSIMO/Text-Hunspell-%{version}.tar.gz -Patch1: Text-Hunspell-2.12-no-Alien.patch +Patch1: Text-Hunspell-2.13-no-Alien.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) # Module Build BuildRequires: coreutils @@ -71,6 +71,11 @@ rm -rf %{buildroot} %{_mandir}/man3/Text::Hunspell.3* %changelog +* Mon Jan 11 2016 Paul Howarth <p...@city-fan.org> - 2.13-1 +- Update to 2.13 + - Win32 build support added +- Update patch for using ExtUtils::PkgConfig instead of Alien::Hunspell + * Mon Dec 21 2015 Paul Howarth <p...@city-fan.org> - 2.12-1 - Update to 2.12 - Replaced ExtUtils::PkgConfig with Alien::Hunspell diff --git a/sources b/sources index cfa8f84..047dd4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae866b48db71237a495e31c6bd0cc161 Text-Hunspell-2.12.tar.gz +1d4971ab7aecebe2cbc5f79531c08aeb Text-Hunspell-2.13.tar.gz -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-Text-Hunspell.git/commit/?h=master&id=65f11ad62b363659eaae7dd142adc459d8672fc7 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org