- Resolves: RHEL-70243, remove xdvi due to removal of X11 in ghostscript
- Resolves: RHEL-69757, fix python-sphinx FTBFS
This commit is contained in:
Than Ngo
parent
b6d604aa53
commit
ea82da9a76
@ -1,21 +1,44 @@
|
||||
diff -up texlive-20240311/source/texk/kpathsea/texmf.cnf.texinfo-fix texlive-20240311/source/texk/kpathsea/texmf.cnf
|
||||
--- texlive-20240311/source/texk/kpathsea/texmf.cnf.texinfo-fix 2024-07-04 17:20:11.637094256 +0200
|
||||
+++ texlive-20240311/source/texk/kpathsea/texmf.cnf 2024-07-04 17:29:01.466765113 +0200
|
||||
--- texlive-20240311/source/texk/kpathsea/texmf.cnf.texinfo-fix 2024-12-08 12:52:06.638563497 +0100
|
||||
+++ texlive-20240311/source/texk/kpathsea/texmf.cnf 2024-12-08 13:40:14.565417658 +0100
|
||||
@@ -59,7 +59,7 @@
|
||||
% SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
|
||||
% SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
|
||||
% Sorry for the off-by-one-generation names.
|
||||
-TEXMFROOT = $SELFAUTOPARENT
|
||||
+TEXMFROOT = /usr/share/texlive
|
||||
|
||||
% The various texmf trees used by TeX Live, follow.
|
||||
% They must must all have the TDS directory structure (https://tug.org/tds).
|
||||
@@ -72,10 +72,10 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
|
||||
TEXMFMAIN = $TEXMFDIST
|
||||
|
||||
% Local additions to the distribution trees.
|
||||
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
|
||||
+TEXMFLOCAL = /usr/share/texlive/texmf-local
|
||||
|
||||
% TEXMFSYSVAR, where *-sys store cached runtime data.
|
||||
-TEXMFSYSVAR = $TEXMFROOT/texmf-var
|
||||
+TEXMFSYSVAR = /var/lib/texmf
|
||||
|
||||
% TEXMFSYSCONFIG, where *-sys store configuration data.
|
||||
TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
|
||||
@@ -86,6 +86,9 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
|
||||
% to %USERPROFILE% on Windows, $HOME otherwise.
|
||||
TEXMFHOME = ~/texmf
|
||||
|
||||
+% Texinfo on Fedora lives out of $TEXMFROOT
|
||||
+TEXINFOHOME = $SELFAUTODIR/share/texmf
|
||||
+TEXINFOHOME = /usr/share/texmf
|
||||
+
|
||||
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
|
||||
TEXMFVAR = ~/.texlive2024/texmf-var
|
||||
|
||||
@@ -112,6 +115,7 @@ TEXMFAUXTREES = {}
|
||||
@@ -111,7 +114,7 @@ TEXMFAUXTREES = {}
|
||||
% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree
|
||||
% is defined (99% common case), no extra elements will be added to
|
||||
% the search paths. tlmgr takes care to end any value with a trailing comma.
|
||||
TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
|
||||
+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXINFOHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
|
||||
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
|
||||
+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXINFOHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
|
||||
|
||||
% Where to look for, and where mktexlsr creates, ls-R files. By default,
|
||||
% this is all and only the !! elements of TEXMF, so that mktexlsr does not
|
||||
|
||||
31
texlive.spec
31
texlive.spec
@ -22,15 +22,15 @@
|
||||
# We do not want exec perms changing.
|
||||
%global __brp_mangle_shebangs_exclude ^$
|
||||
|
||||
# luajit only supports x86_64
|
||||
# Remove luajittex
|
||||
%global luajittex 0
|
||||
%ifarch aarch64 %{power64} s390 s390x
|
||||
%global luajittex 0
|
||||
%endif
|
||||
|
||||
# Remove xdvi due to X11 removal from rhel10/c10s
|
||||
%global xdvi 0
|
||||
|
||||
Name: texlive
|
||||
Version: %{source_date}
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Epoch: %{tl_epoch}
|
||||
Summary: TeX formatting system
|
||||
Group: Applications/Publishing
|
||||
@ -204,8 +204,10 @@ Source216: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/tex.tar.
|
||||
Source217: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/tex.doc.tar.xz
|
||||
Source218: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/texlive.infra.tar.xz
|
||||
Source219: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/texlive.infra.doc.tar.xz
|
||||
%if %{xdvi}
|
||||
Source220: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xdvi.tar.xz
|
||||
Source221: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xdvi.doc.tar.xz
|
||||
%endif
|
||||
Source222: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/courier.tar.xz
|
||||
Source223: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/euro.tar.xz
|
||||
Source224: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/euro.doc.tar.xz
|
||||
@ -852,6 +854,9 @@ Summary: TeX Live filesystem, metadata and licenses shipped in text form
|
||||
BuildArch: noarch
|
||||
Requires: coreutils
|
||||
Obsoletes: texlive-texlive-docindex < %{tl_epoch}:%{source_date}
|
||||
%if ! %{xdvi}
|
||||
Obsoletes: texlive-xdvi < %{tl_epoch}:%{source_date}-6
|
||||
%endif
|
||||
|
||||
%description base
|
||||
TeX Live licenses shipped in text form.
|
||||
@ -10594,9 +10599,11 @@ Requires: texlive-texlive-msg-translations
|
||||
Requires: texlive-texlive-scripts
|
||||
# Requires: texlive-tlshell
|
||||
Requires: texlive-unicode-data
|
||||
%if %{xdvi}
|
||||
Requires: texlive-xdvi
|
||||
%endif
|
||||
Provides: tex(tex) = %{tl_version}, tex = %{tl_version}
|
||||
Requires: dvipdfmx, xdvik
|
||||
Requires: dvipdfmx
|
||||
|
||||
%description collection-basic
|
||||
These files are regarded as basic for any TeX system, covering
|
||||
@ -11407,6 +11414,7 @@ tools (notably tlmgr) running: perl modules, xz binaries, plus
|
||||
(sometimes) tar and wget. These files end up in the standalone
|
||||
install packages, and in the tlcritical repository.
|
||||
|
||||
%if %{xdvi}
|
||||
%package xdvi
|
||||
License: MIT
|
||||
Summary: A DVI previewer for the X Window System
|
||||
@ -11426,6 +11434,7 @@ based systems. The distribution has been integrated with that
|
||||
of xdvik (no longer separately available), so that it will
|
||||
build with web2c "out of the box". In practice, it is usually
|
||||
distributed via Tex-live.
|
||||
%endif
|
||||
|
||||
%package collection-fontsrecommended
|
||||
Summary: Recommended fonts
|
||||
@ -24482,7 +24491,11 @@ cd work
|
||||
--with-system-libpaper \
|
||||
--with-system-potrace \
|
||||
--with-pic \
|
||||
%if %{xdvi}
|
||||
--with-xdvi-x-toolkit=xaw \
|
||||
%else
|
||||
--disable-xdvik \
|
||||
%endif
|
||||
--with-system-mpfr \
|
||||
--with-system-gmp \
|
||||
--enable-shared \
|
||||
@ -25791,6 +25804,7 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
|
||||
%doc %{_texdir}/texmf-dist/scripts/texlive/NEWS
|
||||
%doc %{_texdir}/tlpkg/README
|
||||
|
||||
%if %{xdvi}
|
||||
%files xdvi
|
||||
%license mit.txt
|
||||
%{_bindir}/xdvi
|
||||
@ -25798,6 +25812,7 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
|
||||
%{_mandir}/man1/xdvi.1*
|
||||
%{_texdir}/texmf-dist/dvips/xdvi/
|
||||
%{_texdir}/texmf-dist/xdvi/
|
||||
%endif
|
||||
|
||||
%files collection-fontsrecommended
|
||||
|
||||
@ -27816,6 +27831,10 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
|
||||
%{_texdir}/texmf-dist/tex/latex/hypcap
|
||||
|
||||
%changelog
|
||||
* Fri Dec 06 2024 Than Ngo <than@redhat.com> - 13:20240311-6
|
||||
- Resolves: RHEL-70243, remove xdvi due to removal of X11 in ghostscript
|
||||
- Resolves: RHEL-69757, fix python-sphinx FTBFS
|
||||
|
||||
* Fri Nov 08 2024 Than Ngo <than@redhat.com> - 13:202403
|
||||
- Add two subpackages for texlive 2024: firstaid, hypcap
|
||||
can't find latex2e-first-aid-for-external-files.ltx file
|
||||
|
||||
Loading…
Reference in New Issue
Block a user