[perl-Lucy: 21/28] 0.315 bump

[Lubomir Rintel]

commit fd6f1dc46e90050ff55dd7a3927388fbc016449d
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Jun 20 12:15:36 2012 +0200

    0.315 bump
    
    Should restore compatibility with perl 5.16.0.

 .gitignore           |    1 +
 perl-KinoSearch.spec |   63 ++++++++++++++++++++++++++++++++++++-------------
 sources              |    2 +-
 3 files changed, 48 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b5ae98..71522e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 KinoSearch-0.165.tar.gz
 /KinoSearch-0.31.tar.gz
+/KinoSearch-0.315.tar.gz
diff --git a/perl-KinoSearch.spec b/perl-KinoSearch.spec
index 91fb7dd..d8b7049 100644
--- a/perl-KinoSearch.spec
+++ b/perl-KinoSearch.spec
@@ -1,6 +1,11 @@
+# Upstream returns to 2-digit form repeatedly
+%global cpan_version_major 0.31
+%global cpan_version_minor 5
+%global cpan_version %{cpan_version_major}%{cpan_version_minor}
+
 Name:           perl-KinoSearch
-Version:        0.31
-Release:        5%{?dist}
+Version:        %{cpan_version_major}%{?cpan_version_minor:.}%{cpan_version_minor}
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Search engine library
 # ApacheLicense2.0.txt included is included just becuase the upstream
@@ -10,26 +15,47 @@ Summary:        Search engine library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/KinoSearch/
-Source0:        http://www.cpan.org/authors/id/C/CR/CREAMYG/KinoSearch-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CR/CREAMYG/KinoSearch-%{cpan_version}.tar.gz
 Source1:        LICENSING.mbox
-BuildRequires:  perl(Compress::Zlib)
-BuildRequires:  perl(ExtUtils::CBuilder)
-BuildRequires:  perl(ExtUtils::ParseXS)
-BuildRequires:  perl(Lingua::Stem::Snowball) >= 0.94
-BuildRequires:  perl(Lingua::StopWords) >= 0.02
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Devel::PPPort) >= 3.13
+BuildRequires:  perl(Env)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(ExtUtils::CBuilder) >= 0.18
+BuildRequires:  perl(ExtUtils::ParseXS) >= 2.16
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
-BuildRequires:  perl(Test::Pod) >= 1.14
-BuildRequires:  perl(Time::HiRes)
-BuildRequires:  perl(JSON::XS)
+BuildRequires:  perl(Scalar::Util)
+# Run-time
+BuildRequires:  perl(Compress::Zlib)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(IO::Select)
+BuildRequires:  perl(IO::Socket::INET)
+BuildRequires:  perl(JSON::XS) >= 1.53
+BuildRequires:  perl(Lingua::Stem::Snowball) >= 0.952
+BuildRequires:  perl(Lingua::StopWords) >= 0.09
+BuildRequires:  perl(XSLoader)
+# Tests
+BuildRequires:  perl(CGI)
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(List::Util)
 BuildRequires:  perl(Parse::RecDescent)
-Requires:       perl(Compress::Zlib)
-Requires:       perl(Lingua::Stem::Snowball) >= 0.94
-Requires:       perl(Lingua::StopWords) >= 0.02
+BuildRequires:  perl(Storable)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Time::HiRes)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Time::HiRes)
+Requires:       perl(Data::Dumper)
+Requires:       perl(JSON::XS) >= 1.53
+Requires:       perl(Lingua::Stem::Snowball) >= 0.952
+Requires:       perl(Lingua::StopWords) >= 0.09
 
 %{?perl_default_filter}
+# Remove under-specified dependencies
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(JSON::XS\\)$
 
 %description
 KinoSearch is a loose port of the Java search engine library Apache Lucene,
@@ -37,7 +63,7 @@ written in Perl and C. The archetypal application is website search, but it
 can be put to many different uses.
 
 %prep
-%setup -q -n KinoSearch-%{version}
+%setup -q -n KinoSearch-%{cpan_version}
 cp %{SOURCE1} LICENSING.mbox
 
 %build
@@ -68,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jun 20 2012 Petr Pisar <ppisar at redhat.com> - 1:0.31.5-1
+- 0.315 bump
+
 * Sat Jun 16 2012 Petr Pisar <ppisar at redhat.com> - 1:0.31-5
 - Perl 5.16 rebuild
 
diff --git a/sources b/sources
index 4bf1708..2d7c950 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9f0e05b9131fca33c4cb42ece2f5a9f  KinoSearch-0.31.tar.gz
+2801b61f60240dfcfb09aff5b48b8aae  KinoSearch-0.315.tar.gz