rpms/texlive
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- removed obsoleted patch

Browse Source 
- fixed file conflicts in bibtex, oberdiek, xetex, attachfile, xepersian
- fixed texlive-docindex conflict with texlive-base
Related: RHEL-59868
Resolves: RHEL-53483, RHEL-53786
This commit is contained in:
Than Ngo 2024-10-07 17:06:05 +02:00
parent c5a2883564
commit cea56dbc93
2 changed files with 34 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
texlive-fedora-texmfcnf.lua.patch
View File

@ -1,59 +0,0 @@
diff -up ./web2c/texmfcnf.lua.fedora ./web2c/texmfcnf.lua
--- ./web2c/texmfcnf.lua.fedora 2023-05-25 10:25:41.195939763 -0400
+++ ./web2c/texmfcnf.lua 2023-05-25 10:33:33.761097942 -0400
@@ -11,6 +11,7 @@ return {
comment = "ConTeXt MkIV and LMTX configuration file",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
target = "texlive",
+ -- modified for Fedora, based on Preining Norbert's work in Debian
content = {
@@ -52,7 +53,7 @@ return {
TEXMFVAR = "home:" .. hiddentexlivepath .. "/texmf-var",
TEXMFCONFIG = "home:" .. hiddentexlivepath .. "/texmf-config",
- TEXMFSYSVAR = "selfautoparent:texmf-var",
+ TEXMFSYSVAR = "/var/lib/texmf",
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
-- I don't like this texmf under home and texmf-home would make more sense. One never knows
@@ -62,7 +63,7 @@ return {
-- By using prefixes we don't get expanded paths in the cache __path__ entry. This makes the
-- tex root relocatable.
- TEXMFOS = "selfautodir:",
+ -- TEXMFOS = "selfautodir:",
-- standalone:
@@ -73,14 +74,15 @@ return {
-- texlive:
- TEXMFDIST = "selfautoparent:texmf-dist",
- TEXMFSYSCONFIG = "selfautoparent:texmf-config",
+ TEXMFDIST = "/usr/share/texlive/texmf-dist",
+ TEXMFFEDORA = "/usr/share/texmf",
+ TEXMFSYSCONFIG = "/usr/share/texlive/texmf-config",
-- The texmf-local path is only used for (maybe) some additional configuration file.
- TEXMFLOCAL = "selfautoparent:texmf-local",
- TEXMFFONTS = "selfautoparent:texmf-fonts",
- TEXMFPROJECT = "selfautoparent:texmf-project",
+ TEXMFLOCAL = "/usr/share/texlive/texmf-local",
+ -- TEXMFFONTS = "selfautoparent:texmf-fonts",
+ -- TEXMFPROJECT = "selfautoparent:texmf-project",
TEXMFHOME = "home:texmf",
-- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf",
@@ -94,7 +96,7 @@ return {
-- texlive:
- TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
+ TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFFEDORA,!!$TEXMFDIST}",
TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",

58
texlive.spec
View File

@ -26,7 +26,7 @@
Name: texlive
Version: %{source_date}
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: %{tl_epoch}
Summary: TeX formatting system
Group: Applications/Publishing
@ -815,9 +815,6 @@ Patch37: texlive-base-libpaperv2.patch
# Fix issue where off_t could be set incorrectly on i686 due to order of header load
Patch44: texlive-base-20220321-pdf-header-order-fix.patch
# Fix texmfcnf.lua for Fedora layout (thanks to Preining Norbert)
Patch45: texlive-fedora-texmfcnf.lua.patch
# Fix interpreter on perl scripts (thanks again to Debian)
Patch46: texlive-base-20230311-fix-scripts.patch
@ -845,6 +842,7 @@ as well as the documentation for the included software packages.
Summary: TeX Live filesystem, metadata and licenses shipped in text form
BuildArch: noarch
Requires: coreutils
Obsoletes: texlive-texlive-docindex < %{tl_epoch}:%{source_date}
%description base
TeX Live licenses shipped in text form.
@ -3656,7 +3654,7 @@ License: Knuth-CTAN
Summary: Process bibliographies for LaTeX, etc
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tex(apalike.sty) = %{epoch}:%{source_date}-%{release}
Provides: tex(apalike.tex) = %{epoch}:%{source_date}-%{release}
@ -3691,7 +3689,7 @@ Obsoletes: texlive-kpathsea-doc < %{tl_epoch}:%{source_date}
Requires(post): texlive-texlive-scripts = %{epoch}:%{source_date}-%{release}
Requires: coreutils, grep
Requires: texlive-base
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tex(fmtutil.cnf) = %{epoch}:%{source_date}-%{release}
Provides: tex(mktex.cnf) = %{epoch}:%{source_date}-%{release}
Provides: tex(texmf.cnf) = %{epoch}:%{source_date}-%{release}
@ -10656,7 +10654,7 @@ License: GPL-1.0-or-later
Summary: A DVI to PostScript driver
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post,postun): /sbin/install-info
Provides: tex(canonex.cfg) = %{epoch}:%{source_date}-%{release}
Provides: tex(cx.cfg) = %{epoch}:%{source_date}-%{release}
@ -10822,7 +10820,7 @@ Summary: Convert "ghostscript fonts" to PK files
Obsoletes: texlive-gsftopk-bin < %{tl_epoch}:%{source_date}
Requires: texlive-base
Requires: tex-kpathsea
Requires: texlive-lib = %{epoch}:%{source_date}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{source_date}-%{release}
%description gsftopk
Designed for use with xdvi and dvips this utility converts
@ -11150,7 +11148,7 @@ Requires: texlive-plain
Requires: texlive-tex-ini-files
Requires: texlive-unicode-data
Requires: texlive-hyph-utf8
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description luajittex
LuaTeX with just-in-time (jit) compiler, with and without HarfBuzz.
@ -11202,7 +11200,7 @@ Provides: texlive-makeindex-doc = %{epoch}:%{source_date}-%{release}
Obsoletes: texlive-makeindex-doc < %{tl_epoch}:%{source_date}
Requires: texlive-base
Requires: tex-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description makeindex
A general purpose hierarchical index generator; it accepts one
@ -11222,7 +11220,7 @@ Obsoletes: %{name}-metafont-bin < %{tl_epoch}:%{source_date}
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-tetex
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post,postun): coreutils
Provides: tex(mf.mf) = %{epoch}:%{source_date}-%{release}
Provides: tex(plain.mf) = %{epoch}:%{source_date}-%{release}
@ -11274,7 +11272,7 @@ Obsoletes: texlive-mfware-bin < %{tl_epoch}:%{source_date}
Requires: texlive-base
Requires: tex-kpathsea
Requires: texlive-mfware-bin
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description mfware
A collection of programs for processing the output of Metafont.
@ -11301,7 +11299,7 @@ Requires: texlive-knuth-lib
Requires: texlive-plain
Requires: texlive-graphics-def
Requires: tex-tex-ini-files
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tex(dummy-space.map) = %{epoch}:%{source_date}-%{release}
Provides: tex(dummy-space.tfm) = %{epoch}:%{source_date}-%{release}
Provides: tex(dummy-space.pfb) = %{epoch}:%{source_date}-%{release}
@ -11360,7 +11358,7 @@ Requires: texlive-knuth-lib
Requires: texlive-kpathsea
Requires: texlive-plain
Requires: texlive-tetex
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post,postun): coreutils
%description tex
@ -11411,7 +11409,7 @@ Provides: xdvi = %{epoch}:%{source_date}-%{release}
Provides: xdvik = %{epoch}:%{source_date}-%{release}
Requires: texlive-kpathsea
Requires: texlive-base
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description xdvi
The canonical previewer for use on Unix and other X-windows
@ -15579,7 +15577,7 @@ License: LPPL-1.3c
Summary: Convert (La)TeX to HTML/XML
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tetex-tex4ht = %{epoch}:%{source_date}-%{release}
Obsoletes: tetex-tex4ht < %{tl_epoch}:%{source_date}
Provides: tex(m-tex4ht.tex) = %{epoch}:%{source_date}-%{release}
@ -19134,7 +19132,7 @@ Requires: texlive-l3kernel
Requires: texlive-latex-fonts
Requires: texlive-lm
Requires: teckit
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post,postun): coreutils
Requires: tex(xetex.def)
Provides: tex(qx-unicode.map) = %{epoch}:%{source_date}-%{release}
@ -19497,7 +19495,7 @@ License: LGPL-2.1-or-later
Summary: A fast DVI to PNG/GIF converter
Requires: texlive-base
Requires: tex-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post,postun): /sbin/install-info
%description dvipng
@ -19721,7 +19719,7 @@ License: LPPL-1.3c
Summary: fontware package
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description fontware
fontware package
@ -20224,7 +20222,7 @@ Requires: tex-kpathsea
Requires: tex(ifluatex.sty)
Requires: tex(luatexbase-loader.sty)
Requires: tex(etex.sty)
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tex(luatexbase-attr.sty) = %{epoch}:%{source_date}-%{release}
Provides: tex(luatexbase-cctb.sty) = %{epoch}:%{source_date}-%{release}
Provides: tex(luatexbase-compat.sty) = %{epoch}:%{source_date}-%{release}
@ -21929,7 +21927,7 @@ Summary: A development of Metafont for creating graphics
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-tetex
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
Provides: tex(freeeuro.afm) = %{epoch}:%{source_date}-%{release}
Provides: tex(psyrgo.afm) = %{epoch}:%{source_date}-%{release}
Provides: tex(zpzdr-reversed.afm) = %{epoch}:%{source_date}-%{release}
@ -22803,7 +22801,7 @@ License: GPL-1.0-or-later
Summary: Convert DVI files to Scalable Vector Graphics format (SVG)
Requires: texlive-base
Requires: texlive-kpathsea
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description dvisvgm
Dvisvgm is a command line utility that converts TeX DVI files
@ -23525,7 +23523,7 @@ Requires: texlive-plain
Requires: texlive-tex-ini-files
Requires: texlive-unicode-data
Requires: texlive-hyph-utf8
Requires: texlive-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-lib%{?_isa} = %{epoch}:%{version}-%{release}
%description luahbtex
LuaTeX with HarfBuzz library for glyph shaping.
@ -25173,6 +25171,7 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
%files attachfile
%license lppl1.3c.txt
%{_texdir}/texmf-dist/tex/latex/attachfile/
%{_texdir}/texmf-dist/bibtex/bib/attachfile/
%doc %{_texdir}/texmf-dist/doc/latex/attachfile/
%files avantgar
@ -25242,7 +25241,10 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
%files bibtex
%license knuth.txt
%{_texdir}/texmf-dist/bibtex/
%{_texdir}/texmf-dist/bibtex/bib/base/
%{_texdir}/texmf-dist/bibtex/bst/base/
# exclude bibtex8 stuff
%exclude %{_texdir}/texmf-dist/bibtex/csf/base/
%{_mandir}/man1/bibtex.1*
%doc %{_texdir}/texmf-dist/doc/bibtex/
%{_texdir}/texmf-dist/tex/generic/bibtex/
@ -26492,6 +26494,7 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
%{_mandir}/man1/xetex.1*
%{_mandir}/man1/xetex-unsafe.1*
%{_texdir}/tlpkg/tlpostcode/xetex.pl
%exclude %{_texdir}/texmf-dist/fonts/misc/xetex/fontmapping/xepersian/
%{_texdir}/texmf-dist/fonts/misc/xetex/
%{fmtutil_cnf_d}/xelatex-dev
%{fmtutil_cnf_d}/xetex
@ -27771,6 +27774,13 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
%{_texdir}/texmf-dist/tex/latex/xfrac
%changelog
* Mon Oct 07 2024 Than Ngo <than@redhat.com> - 13:20240311-2
- removed obsoleted patch
- fixed file conflicts in bibtex, oberdiek, xetex, attachfile, xepersian
- fixed texlive-docindex conflict with texlive-base
Related: RHEL-59868
Resolves: RHEL-53483, RHEL-53786
* Sat Oct 05 2024 Than Ngo <than@redhat.com> - 13:20240311-1
- Resolves: RHEL-59868, update to texlive-2024