diff --git a/texlive.changes b/texlive.changes index 4a59a65..cf99dfb 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 08:40:22 UTC 2014 - werner@suse.de + +- Correct patch number scheme of latest change + ------------------------------------------------------------------- Wed Apr 30 20:05:29 UTC 2014 - dimstar@opensuse.org diff --git a/texlive.spec b/texlive.spec index 699aad9..c2ced31 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 81 +%define texlive_noarch 83 %define texlive_source texlive-20130620-source %define __perl_requires %{nil} @@ -221,6 +221,8 @@ Patch20: source-asymptote.dif Patch21: source-bnc856363.dif # PATCH-FIX-UPSTREAM Do not be fooled on big endian and Patch22: source-dvipdfmx.dif +# PATCH-FIX-UPSTREAM source-poppler-0.26.patch dimstar@opensuse.org -- Fix build with Poppler 0.26 +Patch23: source-poppler-0.26.patch # PATCH-FIX-UPSTREAM build with perl 5.18.0 Patch40: biber-dev.patch # PATCH-EXTEND-UPSTREAM Use always system CA certificates @@ -231,8 +233,6 @@ Patch42: biblatex-encoding.dif Patch43: biber-av.patch # PATCH-FIX-UPSTREAM deal with semantic change of Perl Readonly implementation in version 1.04 Patch44: biber-noreadonly.diff -# PATCH-FIX-UPSTREAM source-poppler-0.26.patch dimstar@opensuse.org -- Fix build with Poppler 0.26 -Patch45: source-poppler-0.26.patch Prefix: %{_bindir} %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)} @@ -2285,6 +2285,7 @@ This package is required by the package texlive-biber-bin. %patch20 -p0 -b .asymptote %patch21 -p0 -b .bnc856363 %patch22 -p0 -b .be +%patch23 -p1 -b .poppler-0.26 %patch0 %if %{with buildbiber} pushd ../biblatex-biber-* @@ -2296,7 +2297,6 @@ pushd ../biblatex-biber-* %patch44 -p1 -b .ro popd %endif -%patch45 -p1 -b .poppler-0.26 # Correct FHS paths paths=$(find -name cnf-to-paths.awk)