pool/texlive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 587485 from Publishing:TeXLive

Browse Source 
- Add patch biber-perl-5.30.dif to avoid trouble with perl 5.30 and biber 

- Add missing dependencies for perl-biber (boo#1084900) 

- Remove xorg-x11-devel and Mesa-devel from buildrequires.

OBS-URL: https://build.opensuse.org/request/show/587485
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2018-03-22 10:55:38 +00:00 committed by Git OBS Bridge
commit 7d697b1bb2
3 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
biber-perl-5.30.dif Normal file
View File

@ -0,0 +1,17 @@
Fun with Perl 5.30
---
lib/Biber/LaTeX/Recode.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm 2018-03-15 08:49:32.341586613 +0000
@@ -313,7 +313,7 @@ sub latex_decode {
# Workaround perl's lack of variable-width negative look-behind -
# Reverse string (and therefore some of the Re) and use variable width negative look-ahead
$text = reverse $text;
- $text =~ s/}(\pM+\pL){(?!\pL+\\)/$1/g;
+ $text =~ s/}(\pM+\pL)\{(?!\pL+\\)/$1/g;
$text = reverse $text;
# Replace verbatim field markers

15
texlive.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Mar 15 08:54:09 UTC 2018 - werner@suse.de
- Add patch biber-perl-5.30.dif to avoid trouble with perl 5.30 and biber
-------------------------------------------------------------------
Thu Mar 15 07:29:33 UTC 2018 - werner@suse.de
- Add missing dependencies for perl-biber (boo#1084900)
-------------------------------------------------------------------
Wed Mar 14 18:57:04 UTC 2018 - crrodriguez@opensuse.org
- Remove xorg-x11-devel and Mesa-devel from buildrequires.
-------------------------------------------------------------------
Tue Feb 6 15:14:53 UTC 2018 - meissner@suse.com

34
texlive.spec
View File

@ -73,7 +73,7 @@ Name: texlive
Version: %{texlive_version}.%{texlive_release}
Release: 0
Summary: The TeXLive Formatting System
License: GPL-2.0+ and GPL-2.0 and GPL-3.0 and LPPL-1.3c and LPPL-1.0 and Artistic-1.0 and Apache-2.0 and MIT and BSD-3-Clause and SUSE-TeX and SUSE-Public-Domain
License: GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND LPPL-1.3c AND LPPL-1.0 AND Artistic-1.0 AND Apache-2.0 AND MIT AND BSD-3-Clause AND SUSE-TeX AND SUSE-Public-Domain
Group: Productivity/Publishing/TeX/Base
Url: http://www.tug.org/texlive/
PreReq: /usr/bin/perl
@ -134,9 +134,6 @@ BuildRequires: %{name}-filesystem
BuildRequires: ghostscript-devel
BuildRequires: ghostscript-library
BuildRequires: glibc-devel
%if 0%{suse_version} > 1220
BuildRequires: glu-devel
%endif
BuildRequires: graphite2-devel
BuildRequires: gsl-devel
BuildRequires: harfbuzz-devel
@ -144,12 +141,6 @@ BuildRequires: jpeg
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel
%if 0%{suse_version} > 1220
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(osmesa)
%else
BuildRequires: Mesa-devel
%endif
BuildRequires: libpaper-devel
BuildRequires: libpng-devel
BuildRequires: libpoppler-devel
@ -164,14 +155,21 @@ BuildRequires: pango-tools
BuildRequires: potrace-devel
BuildRequires: pwdutils
BuildRequires: readline-devel
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildConflicts: texinfo
BuildRequires: unzip
BuildRequires: xaw3d-devel
BuildRequires: xorg-x11-devel
BuildRequires: xz
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: zziplib-devel
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xmu)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xt)
%if %{with buildbiber}
BuildRequires: perl-base >= 5.24.1
BuildRequires: perl(autovivification)
@ -261,6 +259,8 @@ Patch20: source-missed-scripts.dif
Patch42: biblatex-encoding.dif
# PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
Patch44: biber-certs.dif
# PATCH-FIX-SUSE Make biber work with perl 5.30
Patch46: biber-perl-5.30.dif
# PATCH-FIX-SUSE Make biber work with perl 5.18.2
Patch47: biber-perl-5.18.2.dif
# PATCH-FIX-UPSTREAM texlive-20170524-source-poppler059-1.patch dimstar@opensuse.org -- Adapt to poppler 0.59 API changes
@ -3039,7 +3039,7 @@ Binary files of yplan
Version: 6.2.3
Release: 0
Summary: Path searching library for TeX-related files
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: System/Libraries
Url: http://www.tug.org/texlive/
Prefix: %{_libdir}
@ -3056,7 +3056,7 @@ the TeX-live sources.
Version: 6.2.3
Release: 0
Summary: Path searching library for TeX-related files
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.2.3
@ -3187,7 +3187,7 @@ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language
Version: %{texlive_version}.%{texlive_release}
Release: 0
Summary: Basic development packages for TeXLive
License: LGPL-2.1+ and BSD-3-Clause and SUSE-TeX
License: LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-TeX
Group: Development/Languages/Other
Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.2.3
@ -3222,7 +3222,10 @@ Requires: perl(Data::Compare)
Requires: perl(Data::Dump)
Requires: perl(Data::Uniqid)
Requires: perl(Date::Simple)
Requires: perl(DateTime)
Requires: perl(DateTime::Calendar::Julian)
Requires: perl(DateTime::Format::Builder)
Requires: perl(DateTime::TimeZone)
Requires: perl(Encode::EUCJPASCII)
Requires: perl(Encode::HanExtra)
Requires: perl(Encode::JIS2K)
@ -3418,6 +3421,9 @@ pushd ../biblatex-biber-*
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
%patch42 -p0 -b .en
%patch44 -p0 -b .noica
%if 0%{perl_versnum} >= 5260
%patch46 -p0 -b .530
%endif
%if 0%{perl_versnum} < 5200
%patch47 -p0 -b .518
%endif