diff --git a/.gitignore b/.gitignore index 42ebd7c..2b7fda1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /biblatex-biber.tar.gz /bibtex-forms.bib /bibtex-forms.bcf +/v2.6.tar.gz diff --git a/biber-drop-builddeps-for-monolithic-build.patch b/biber-drop-builddeps-for-monolithic-build.patch index 50f8879..8fef935 100644 --- a/biber-drop-builddeps-for-monolithic-build.patch +++ b/biber-drop-builddeps-for-monolithic-build.patch @@ -13,7 +13,7 @@ diff --git a/Build.PL b/Build.PL index d84786d..e97cea5 100644 --- a/Build.PL +++ b/Build.PL -@@ -38,10 +38,7 @@ my $builder = $class->new( +@@ -36,10 +36,7 @@ my $builder = $class->new( }, add_to_cleanup => [ 'biber-*' ], configure_requires => { 'Module::Build' => 0.38 }, @@ -23,8 +23,5 @@ index d84786d..e97cea5 100644 - }, + build_requires => { }, requires => { - 'autovivification' => 0, - 'Data::Dump' => 0, --- -2.5.0 - + 'autovivification' => 0, + 'Class::Accessor' => 0, diff --git a/biber.spec b/biber.spec index 4db3860..3941d1f 100644 --- a/biber.spec +++ b/biber.spec @@ -1,30 +1,20 @@ Name: biber -Version: 2.1 -Release: 5%{?dist} +Version: 2.6 +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 -# Missing from tarball: http://github.com/plk/biber/issues/100 -Source1: https://github.com/plk/biber/blob/v%{version}/t/tdata/bibtex-forms.bib -Source2: https://github.com/plk/biber/blob/v%{version}/t/tdata/bibtex-forms.bcf +Source0: https://github.com/plk/biber/archive/v%{version}.tar.gz # not appropriate for upstream: http://github.com/plk/biber/pull/97 Patch0: biber-drop-builddeps-for-monolithic-build.patch -# cherry-pick from upstream: otherwise need perl-Unicode-Normalize <= 1.17 -Patch1: biber-bump-perl-u-n-dep-with-xsub.patch -# cherry-pick from upstream for brace warning and tests -Patch2: biber-updates-for-perl-5.22-changes.patch -Patch3: biber-test-fixes-for-Fedora.patch -Patch4: biber-more-sort-test-fixes.patch -# safe to drop this failing test: http://github.com/plk/biber/issues/72 -Patch5: biber-drop-minor-failing-test.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-generators BuildRequires: perl(autovivification) BuildRequires: perl(base) +BuildRequires: perl(Business::ISMN) BuildRequires: perl(Business::ISSN) BuildRequires: perl(constant) BuildRequires: perl(Capture::Tiny) @@ -33,9 +23,14 @@ BuildRequires: perl(Cwd) BuildRequires: perl(Data::Dump) BuildRequires: perl(Data::Compare) BuildRequires: perl(Date::Simple) +BuildRequires: perl(Data::Uniqid) +BuildRequires: perl(DateTime::Calendar::Julian) BuildRequires: perl(Digest::MD5) BuildRequires: perl(Encode) BuildRequires: perl(Encode::Alias) +BuildRequires: perl(Encode::EUCJPASCII) +BuildRequires: perl(Encode::HanExtra) +BuildRequires: perl(Encode::JIS2K) BuildRequires: perl(Exporter) BuildRequires: perl(File::Compare) BuildRequires: perl(File::Copy) @@ -47,6 +42,7 @@ BuildRequires: perl(File::Which) BuildRequires: perl(IO::File) BuildRequires: perl(IPC::Cmd) BuildRequires: perl(IPC::Run3) +BuildRequires: perl(Lingua::Translit) BuildRequires: perl(List::AllUtils) BuildRequires: perl(List::Util) BuildRequires: perl(locale) @@ -55,6 +51,7 @@ BuildRequires: perl(Log::Log4perl::Appender::File) BuildRequires: perl(Log::Log4perl::Appender::Screen) BuildRequires: perl(Log::Log4perl::Layout::PatternLayout) BuildRequires: perl(Log::Log4perl::Layout::SimpleLayout) +BuildRequires: perl(LWP::Protocol::https) BuildRequires: perl(Module::Build) >= 0.38 BuildRequires: perl(open) BuildRequires: perl(POSIX) @@ -62,7 +59,10 @@ BuildRequires: perl(re) BuildRequires: perl(Regexp::Common) BuildRequires: perl(Storable) BuildRequires: perl(sigtrap) +BuildRequires: perl(Sort::Key) BuildRequires: perl(strict) +BuildRequires: perl(Text::CSV) +BuildRequires: perl(Text::CSV_XS) BuildRequires: perl(Test::Differences) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) @@ -117,15 +117,8 @@ functionality. It is often used with the popular BibLaTeX package %prep -%setup -q -n biblatex-biber-%{version} -cp -p %{SOURCE1} t/tdata/bibtex-forms.bib -cp -p %{SOURCE2} t/tdata/bibtex-forms.bcf +%setup -q -n biber-%{version} %patch0 -p1 -%patch1 -p1 -F3 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build @@ -144,7 +137,7 @@ chmod u+w %{buildroot}%{_bindir}/* %files -%doc README Changes THANKS doc/%{name}.pdf TODO.org +%doc README.md Changes THANKS TODO.org %{_bindir}/%{name} %{_mandir}/man3/* %{_mandir}/man1/* @@ -152,6 +145,9 @@ chmod u+w %{buildroot}%{_bindir}/* %changelog +* Wed Oct 12 2016 Tom Callaway - 2.6-1 +- update to 2.6 + * Tue May 17 2016 Jitka Plesnikova - 2.1-5 - Perl 5.24 rebuild diff --git a/sources b/sources index 291581d..32a60c8 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -c46979acce3befdb3431ffadcc81bdf3 biblatex-biber.tar.gz -e98ff495b0f87625e585947bd8651bc8 bibtex-forms.bib -1a0d31f50d4b3214a74e902f20d78535 bibtex-forms.bcf +0bb4b95df612b477c5f63250f33355da v2.6.tar.gz