From bb2e8a94f34772fdeddcd4a3edfd85fb4e698532 Mon Sep 17 00:00:00 2001
From: Colin B. Macdonald <cbm@m.fsf.org>
Date: Dec 14 2015 19:12:24 +0000
Subject: Bump to 2.1, for biblatex-3.0


- Update deps.
- Add more deps based on upstream confirmation.

---

diff --git a/biber-bump-perl-u-n-dep-with-xsub.patch b/biber-bump-perl-u-n-dep-with-xsub.patch
new file mode 100644
index 0000000..3c56ffc
--- /dev/null
+++ b/biber-bump-perl-u-n-dep-with-xsub.patch
@@ -0,0 +1,22 @@
+From 7998b16045ddcb86a9e2b7ef322f329637653a6b Mon Sep 17 00:00:00 2001
+From: Philip Kime <Philip@kime.org.uk>
+Date: Mon, 26 Oct 2015 21:47:38 +0000
+Subject: [PATCH] Bumped U::N to new XSUB version
+
+---
+ Build.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Build.PL b/Build.PL
+index eefb1a8..d84786d 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -57,7 +57,7 @@ my $builder = $class->new(
+         'Regexp::Common' => 0,
+         'Log::Log4perl' => 0,
+         'Unicode::Collate' => '1.14',
+-        'Unicode::Normalize' => '<= 1.17',# 1.18 removes XS and is too slow
++        'Unicode::Normalize' => '1.23',
+         'Unicode::GCString' => 0,
+         'Encode::EUCJPASCII' => 0,
+         'Encode::JIS2K' => 0,
diff --git a/biber.spec b/biber.spec
index 1fc8f57..b4b8d08 100644
--- a/biber.spec
+++ b/biber.spec
@@ -1,11 +1,13 @@
 Name:           biber
-Version:        1.8
-Release:        12%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Command-line bibliographic manager, BibTeX replacement
 License:        (GPL+ or Artistic 2.0) and Artistic 2.0
 Group:          Development/Tools
 URL:            http://biblatex-biber.sourceforge.net/
 Source0:        https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/%{version}/biblatex-biber.tar.gz
+# cherry-pick from upstream: otherwise need perl-Unicode-Normalize <= 1.17
+Patch0:         biber-bump-perl-u-n-dep-with-xsub.patch
 BuildArch:      noarch
 
 BuildRequires:  perl
@@ -47,12 +49,16 @@ BuildRequires:  perl(Regexp::Common)
 BuildRequires:  perl(Storable)
 BuildRequires:  perl(sigtrap)
 BuildRequires:  perl(strict)
+BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Text::BibTeX) >= 0.66
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Text::BibTeX) >= 0.70
 BuildRequires:  perl(Text::BibTeX::Name)
 BuildRequires:  perl(Text::BibTeX::NameFormat)
+BuildRequires:  perl(Text::Roman)
 BuildRequires:  perl(Text::Wrap)
-BuildRequires:  perl(Unicode::Normalize)
+BuildRequires:  perl(Unicode::Normalize) >= 1.23
 BuildRequires:  perl(Unicode::GCString)
 BuildRequires:  perl(Unicode::Collate::Locale)
 BuildRequires:  perl(URI)
@@ -62,21 +68,30 @@ BuildRequires:  perl(warnings)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  perl(XML::LibXML::Simple)
 BuildRequires:  perl(XML::Writer)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(autovivification)
 Requires:       perl(Business::ISBN)
 Requires:       perl(Business::ISMN)
 Requires:       perl(Business::ISSN)
-Requires:       perl(Unicode::Collate::Locale)
+# Upstream confirmed [1] deps on Encode::* and List::MoreUtils (c.f., [2]).
+# [1] https://github.com/plk/biber/issues/98
+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=1165620
+Requires:       perl(Encode::EUCJPASCII)
+Requires:       perl(Encode::HanExtra)
+Requires:       perl(Encode::JIS2K)
+Requires:       perl(List::MoreUtils)
+Requires:       perl(List::MoreUtils::XS)
 Requires:       perl(LWP::Simple)
 Requires:       perl(LWP::Protocol::https)
-Requires:       perl(Mozilla::CA) >= 20130114
-Requires:       perl(Text::BibTeX) >= 0.66
+Requires:       perl(Mozilla::CA) >= 20141217
+Requires:       perl(Text::BibTeX) >= 0.70
+Requires:       perl(Text::Roman)
+Requires:       perl(Unicode::Collate::Locale)
 Requires:       perl(XML::LibXSLT)
-# Note: biber 1.9 will need 2.9
-Requires:       texlive-biblatex >= 4:svn32245.2.8a
+# Note: biber 2.1 needs 3.0
+Requires:       texlive-biblatex >= 5:svn37083.3.0
 
-# filter autogenerated runtime dep, instead use contraint above
+# filter autogenerated runtime dep, instead use constraint above
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Text::BibTeX\\)$
 
 
@@ -89,6 +104,7 @@ functionality.  It is often used with the popular BibLaTeX package
 
 %prep
 %setup -q -n biblatex-biber-%{version}
+%patch0 -p1 -F3
 
 
 %build
@@ -111,6 +127,11 @@ chmod u+w %{buildroot}%{_bindir}/*
 
 
 %changelog
+* Mon Dec 14 2015 Colin B. Macdonald <cbm@m.fsf.org> 2.1-1
+- Bump to 2.1, for biblatex-3.0.
+- Update deps.
+- Add more deps based on upstream confirmation.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 9e79f7d..bd869b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26b2134291ddd7851973a6c385e5545c  biblatex-biber.tar.gz
+c46979acce3befdb3431ffadcc81bdf3  biblatex-biber.tar.gz