From 9aabc7536bffb705f55656900fea826a7e49b6170a91d1e19141cca2e5754ec1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 17 Jul 2013 08:55:20 +0000 Subject: [PATCH] perl trouble OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=128 --- biber-perl.dif | 11 +++++++++++ texlive.changes | 6 ++++++ texlive.spec | 6 ++++++ 3 files changed, 23 insertions(+) create mode 100644 biber-perl.dif diff --git a/biber-perl.dif b/biber-perl.dif new file mode 100644 index 0000000..6122896 --- /dev/null +++ b/biber-perl.dif @@ -0,0 +1,11 @@ +--- t/utils.t ++++ t/utils.t 2013-07-17 08:46:39.829939441 +0000 +@@ -45,7 +45,7 @@ is(File::Spec->canonpath(locate_biber_fi + SKIP: { + skip "No LaTeX installation", 1 unless can_run('kpsewhich'); + # using kpsewhich +- like(File::Spec->canonpath(locate_biber_file('plain.tex')), qr|plain.tex\cM*\z|, 'File location - 4'); ++ like(File::Spec->canonpath(locate_biber_file('plain.tex')), 'plain.tex', 'File location - 4'); + } + + # In output_directory diff --git a/texlive.changes b/texlive.changes index ef91997..9d6fd9f 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 17 08:54:11 UTC 2013 - werner@suse.de + +- Add patch biber-perl.dif to avoid trouble with Test::Builder of + perl 5.16.2 + ------------------------------------------------------------------- Tue Jul 16 12:36:45 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index 3540227..9f8ca05 100644 --- a/texlive.spec +++ b/texlive.spec @@ -186,6 +186,8 @@ Patch17: source-64.dif Patch18: source-a2ping.dif Patch19: source-dvipng.dif Patch20: source-asymptote.dif +# PATCH-FIX-OPENSUSE Avoid trouble with perl 5.16.2 Test::Builder +Patch31: biber-perl.dif Prefix: %{_bindir} %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)} @@ -2037,6 +2039,10 @@ development packages for TeXLive. %patch19 -p0 -b .dvipng %patch20 -p0 -b .asymptote %patch0 +%if %{with buildbiber} +pushd ../biblatex-biber-* +%patch31 -p0 -b .pmb +popd # Correct FHS paths paths=$(find -name cnf-to-paths.awk)