>From 7ff52c1126202e98ef6450d52ad265b9cdbca94e Mon Sep 17 00:00:00 2001 From: Paul Howarth <p...@city-fan.org> Date: Mon, 21 Dec 2015 16:55:55 +0000 Subject: Update to 2.12
- New upstream release 2.12 - Replaced ExtUtils::PkgConfig with Alien::Hunspell - Explicitly BR: perl-devel, needed for EXTERN.h - We don't have (nor need) Alien::Hunspell, so revert to using ExtUtils::PkgConfig --- Text-Hunspell-2.12-no-Alien.patch | 69 +++++++++++++++++++++++++++++++++++++++ perl-Text-Hunspell.spec | 21 ++++++++++-- sources | 2 +- 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 Text-Hunspell-2.12-no-Alien.patch diff --git a/Text-Hunspell-2.12-no-Alien.patch b/Text-Hunspell-2.12-no-Alien.patch new file mode 100644 index 0000000..8a8207b --- /dev/null +++ b/Text-Hunspell-2.12-no-Alien.patch @@ -0,0 +1,69 @@ +--- 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/perl-Text-Hunspell.spec b/perl-Text-Hunspell.spec index f9adc3f..d6c85f7 100644 --- a/perl-Text-Hunspell.spec +++ b/perl-Text-Hunspell.spec @@ -1,16 +1,23 @@ Name: perl-Text-Hunspell -Version: 2.11 -Release: 3%{?dist} +Version: 2.12 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) # Module Build +BuildRequires: coreutils +BuildRequires: findutils BuildRequires: gcc-c++ BuildRequires: hunspell-devel >= 1.2.8 +BuildRequires: make BuildRequires: perl +%if 0%{?fedora} > 6 || 0%{?rhel} > 5 +BuildRequires: perl-devel +%endif BuildRequires: perl(ExtUtils::MakeMaker) >= 6.52 BuildRequires: perl(ExtUtils::PkgConfig) # Module Runtime @@ -37,6 +44,9 @@ session, such as spell-checking a document in memory. %prep %setup -q -n Text-Hunspell-%{version} +# We don't have (nor need) Alien::Hunspell, so revert to using ExtUtils::PkgConfig +%patch1 + %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} @@ -61,6 +71,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Text::Hunspell.3* %changelog +* Mon Dec 21 2015 Paul Howarth <p...@city-fan.org> - 2.12-1 +- Update to 2.12 + - Replaced ExtUtils::PkgConfig with Alien::Hunspell +- Explicitly BR: perl-devel, needed for EXTERN.h +- We don't have (nor need) Alien::Hunspell, so revert to using + ExtUtils::PkgConfig + * Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 8ca7432..cfa8f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5df1cda4d0063825db0d9f37bd578bdf Text-Hunspell-2.11.tar.gz +ae866b48db71237a495e31c6bd0cc161 Text-Hunspell-2.12.tar.gz -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-Text-Hunspell.git/commit/?h=master&id=7ff52c1126202e98ef6450d52ad265b9cdbca94e -- 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