From bf6879e57d57739ed7cd1c7cd3d6421ce083359946fd09f3e364006af2dec850 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 8 Aug 2013 10:11:27 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=145 --- biblatex-encoding.dif | 30 ++++++++++++++++++++++++++++++ texlive.changes | 6 ++++++ texlive.spec | 7 +++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 biblatex-encoding.dif diff --git a/biblatex-encoding.dif b/biblatex-encoding.dif new file mode 100644 index 0000000..583d70f --- /dev/null +++ b/biblatex-encoding.dif @@ -0,0 +1,30 @@ +--- lib/Biber/Output/base.pm ++++ lib/Biber/Output/base.pm 2013-08-08 09:42:55.189939067 +0000 +@@ -5,6 +5,7 @@ use warnings; + + use Biber::Entry; + use IO::File; ++use PerlIO::encoding; + use Text::Wrap; + $Text::Wrap::columns = 80; + use Log::Log4perl qw( :no_extra_logdie_message ); +--- lib/Biber/Output/bbl.pm ++++ lib/Biber/Output/bbl.pm 2013-08-08 09:43:01.225438687 +0000 +@@ -10,6 +10,7 @@ use Biber::Entry; + use Biber::Utils; + use List::AllUtils qw( :all ); + use IO::File; ++use PerlIO::encoding; + use Log::Log4perl qw( :no_extra_logdie_message ); + use Text::Wrap; + $Text::Wrap::columns = 80; +--- lib/Biber/Output/dot.pm ++++ lib/Biber/Output/dot.pm 2013-08-08 09:43:06.605439073 +0000 +@@ -10,6 +10,7 @@ use Biber::Entry; + use Biber::Utils; + use List::AllUtils qw( :all ); + use IO::File; ++use PerlIO::encoding; + use Log::Log4perl qw( :no_extra_logdie_message ); + my $logger = Log::Log4perl::get_logger('main'); + diff --git a/texlive.changes b/texlive.changes index e1f370b..e89f03b 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 8 09:46:54 UTC 2013 - werner@suse.de + +- Add patch biblatex-encoding.dif - explicite load PerlIO::encoding + for output files, seems to be required for our perl (bnc#833815) + ------------------------------------------------------------------- Wed Aug 7 09:57:30 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index ed1ed67..77c056c 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ %define texlive_version 2013 %define texlive_previous 2011 %define texlive_release 20130620 -%define texlive_noarch 74 +%define texlive_noarch 75 %define texlive_source texlive-20130620-source %define __perl_requires %{nil} @@ -224,6 +224,8 @@ Patch20: source-asymptote.dif Patch40: biber-dev.patch # PATCH-EXTEND-UPSTREAM Use always system CA certificates Patch41: biber-certs.dif +# PATCH-FIX-UPSTREAM Make biber work with out perl +Patch42: biblatex-encoding.dif Prefix: %{_bindir} %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)} @@ -2235,6 +2237,7 @@ pushd ../biblatex-biber-* /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . %patch40 -p0 -b .dev %patch41 -p0 -b .ca +%patch42 -p0 -b .en popd %endif @@ -2470,7 +2473,7 @@ popd %{perl_privlib}/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt %{perl_privlib}/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt %{perl_privlib}/PerlIO;lib/PerlIO - %{perl_privlib}/auto/PerlIO;lib/auto/PerlIO + %{perl_archlib}/auto/PerlIO;lib/auto/PerlIO %{perl_vendorlib}/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml EOF LD_LIBRARY_PATH=/%{_lib}:%{_libdir} \