set TEXMFLOCAL during the context scriptlet to minimize the scope of where it looks during mtxrun --generate

.gitignore

@@ -396,5 +396,3 @@
 /psutils.tar.xz
 /xpdfopen.doc.tar.xz
 /texlive.tlpdb
-/optex.tar.xz
-/optex.doc.tar.xz

sources

@@ -384,5 +384,3 @@ SHA512 (texlive-scripts.tar.xz) = 824dcfa175efa8d1d0d2196cac51afeed0ef81e5497c14
 SHA512 (texware.doc.tar.xz) = 21e62dfb6fff0924568c4942c0f442fb63c68e79e607a8cae34da917e2bc0192e3352c8a03c5dd5bb9338699e53a97c71878304a860b383e4d81f14dd80335e3
 SHA512 (texware.tar.xz) = b464059887713458ff20b9d002b567eba21863501470b654f02e518f9a6f3e7ea1d40ecc321e9b6d7cc7687add76923e96411fd20426eaadfec6cf8a395336ec
 SHA512 (texlive.tlpdb) = 9405238da7ef41b22a9d1b4f32305856b1fc6efcebdb0dc5a9fceca9017e0a4fdbda3df58a37d64a753c003682965c8f6ffe388627d8a663578ee2b2e52ee1a6
-SHA512 (optex.tar.xz) = a418ee16b04ca307c623c5137c125a92dc098b0b3306e823e8e9e3e09db67b87d19b9afe18a213a36e80e3d94b1bf25b2926f715bfde962e9153e0ed8e0b84e1
-SHA512 (optex.doc.tar.xz) = 906021f9a639e222912d989d8f062568918029b896bbf9611bf58d4223635441f2179f121785385ec5147f132d01bc01f980f724434e7020c0675399e09797e0

texlive-base-20200327-out-of-memory.patch

@@ -1,12 +0,0 @@
-diff -up texlive-base-20200327/source/texk/kpathsea/texmf.cnf.me texlive-base-20200327/source/texk/kpathsea/texmf.cnf
---- texlive-base-20200327/source/texk/kpathsea/texmf.cnf.me	2020-09-23 09:35:26.729192291 +0200
-+++ texlive-base-20200327/source/texk/kpathsea/texmf.cnf	2020-09-23 09:36:01.849651692 +0200
-@@ -786,7 +786,7 @@ texmf_casefold_search = 1
- % For some xy-pic samples, you may need as much as 700000 words of memory.
- % For the vast majority of documents, 60000 or less will do.
- %
--main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
-+main_memory = 6000000 % words of inimemory available; also applies to inimf&mp
- extra_mem_top = 0     % extra high memory for chars, tokens, etc.
- extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
- 

texlive-base.spec

@@ -20,8 +20,8 @@
 
 Name: %{shortname}-base
 Version: %{source_date}
-Release: 22%{?dist}
-Epoch: 9
+Release: 21%{?dist}
+Epoch: 7
 Summary: TeX formatting system
 # The only files in the base package are directories, cache, and license texts
 # So we'll just list the license texts. This is also a bit of a lie, since most of these license texts do not apply to themselves.
@@ -417,8 +417,6 @@ Source384: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xmltex.ta
 Source385: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xpdfopen.doc.tar.xz
 Source386: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/yplan.doc.tar.xz
 Source387: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/yplan.tar.xz
-Source388: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/optex.tar.xz
-Source389: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/optex.doc.tar.xz
 Patch1: tl-kpfix.patch
 Patch2: tl-format.patch
 Patch5: texlive-2016-kpathsea-texlive-path.patch
@@ -448,8 +446,6 @@ Patch23: texlive-20200327-poppler-0.84.patch
 Patch28: texlive-base-20190410-CVE-2019-19601.patch
 # Fixes for poppler 0.90 (f33+)
 Patch29: texlive-20200327-poppler-0.90.patch
-# Fix pdflatex run out of memory
-Patch30: texlive-base-20200327-out-of-memory.patch
 
 # Can't do this because it causes everything else to be noarch
 # BuildArch: noarch
@@ -1141,6 +1137,8 @@ License: GPL+ or LPPL
 Summary: The ConTeXt macro package
 Requires: texlive-base
 Requires: texlive-kpathsea
+# for /usr/bin/realpath
+Requires: coreutils
 Requires(post,postun): coreutils
 Requires: texlive-metapost
 %if %{without bootstrap}
@@ -4445,24 +4443,6 @@ Requires: texlive-kpathsea
 %description -n %{shortname}-omegaware
 Omegaware package.
 
-%package -n %{shortname}-optex
-License: Public Domain
-Summary: LuaTeX format based on Plain TeX and OPmac
-Requires: texlive-base
-Requires: texlive-kpathsea
-Requires: texlive-amsfonts
-Requires: texlive-cm
-Requires: texlive-ec
-Requires: texlive-hyphen-base
-Requires: texlive-lm
-Requires: texlive-luatex
-Requires: texlive-rsfs
-
-%description -n %{shortname}-optex
-OpTeX is a LuaTeX format based on Plain TeX macros with power
-from OPmac (fonts selection system, colors, external graphics,
-references, hyperlinks, ...) with unicode fonts.
-
 %package -n %{shortname}-patgen
 Provides: tex-patgen = %{epoch}:%{source_date}-%{release}
 Provides: texlive-patgen-bin = %{epoch}:%{source_date}-%{release}
@@ -5032,6 +5012,7 @@ Requires: texlive-etex
 Requires: texlive-hyphen-base
 Requires: texlive-hyph-utf8
 Requires: texlive-ipaex
+Requires: texlive-japanese
 Requires: texlive-japanese-otf
 Requires: texlive-knuth-lib
 Requires: texlive-kpathsea
@@ -6029,17 +6010,12 @@ License: BSD
 Summary: Binaries for uptex
 Requires: texlive-base
 Requires: texlive-convbkmk
-Requires: texlive-etex
-Requires: texlive-hyphen-base
 Requires: texlive-hyph-utf8
 Requires: texlive-ipaex
+Requires: texlive-japanese
 Requires: texlive-japanese-otf
-Requires: texlive-knuth-lib
 Requires: texlive-kpathsea
-Requires: texlive-plain
-Requires: texlive-ptex-base
-Requires: texlive-uptex-base
-Requires: texlive-uptex-fonts
+Requires: texlive-ptex
 
 %description -n %{shortname}-uptex
 upTeX is an extension of pTeX, using UTF-8 input and producing UTF-8 
@@ -6577,7 +6553,6 @@ xz -dc %{SOURCE0} | tar x
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %patch29 -p1 -b .poppler090
 %endif
-%patch30 -p1 -b .out_of_memory
 
 # Setup copies of the licenses
 for l in `unxz -c %{SOURCE3} | tar t`; do
@@ -6590,6 +6565,11 @@ done
 %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end}
 
 %build
+# The embedded cairo library has a configure script which compiles code
+# and expects it to fail in a very specific way.  LTO changs the failure
+# mode and the cairo configure script does not know how to handle the change
+# Until the configure script is fixed this seems like the best thing to do
+# Disable LTO
 %define _lto_cflags %{nil}
 
 %if %{without bootstrap}
@@ -6914,7 +6894,7 @@ cat > context << EOF
 #!/bin/sh
 export TEXMF=/usr/share/texlive/texmf-dist;
 export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c;
-export TEXMFCACHE=\$HOME/.cache/texlive;
+export TEXMFCACHE=\$(realpath \$HOME/.cache/texlive);
 %{_bindir}/mtxrun --script context "\$@"
 EOF
 chmod 0755 context
@@ -7000,6 +6980,7 @@ fi
 :
 
 %transfiletriggerin -n %{shortname}-context -- %{_texdir}
+export TEXMFLOCAL=/usr/share/texlive/texmf-local
 %{_bindir}/mtxrun --generate &> /dev/null || :
 
 %transfiletriggerin -n %{shortname}-kpathsea -- %{_texdir}
@@ -7428,8 +7409,8 @@ done <<< "$list"
 %exclude %{_texdir}/texmf-dist/scripts/context/perl/mptopdf.pl
 %{_texdir}/texmf-dist/scripts/context/
 %{_texdir}/texmf-dist/tex/context/
-%exclude %{_texdir}/texmf-dist/tex/generic/context/mptopdf
 %{_texdir}/texmf-dist/tex/generic/context/
+%exclude %{_texdir}/texmf-dist/tex/generic/context/mptopdf
 %{_texdir}/texmf-dist/tex/latex/context/
 %{fmtutil_cnf_d}/context
 
@@ -8124,6 +8105,7 @@ done <<< "$list"
 %{_bindir}/dvilualatex-dev
 %{_bindir}/luacsplain
 %{_bindir}/luatex
+%{_bindir}/optex
 %{_bindir}/texlua
 %{_bindir}/texluac
 %{_mandir}/man1/dvilualatex-dev.1*
@@ -8135,6 +8117,7 @@ done <<< "$list"
 %{_texdir}/texmf-dist/tex/generic/config/luatexiniconfig.tex
 %{_texdir}/texmf-dist/web2c/texmfcnf.lua
 %{fmtutil_cnf_d}/luatex
+%{fmtutil_cnf_d}/optex
 %doc %{_texdir}/texmf-dist/doc/luatex/base/
 
 %files -n %{shortname}-lwarp
@@ -8368,13 +8351,6 @@ done <<< "$list"
 %{_mandir}/man1/ovf2ovp.1*
 %{_mandir}/man1/ovp2ovf.1*
 
-%files -n %{shortname}-optex
-%{_bindir}/optex
-%{fmtutil_cnf_d}/optex
-%{_mandir}/man1/optex.1*
-%{_texdir}/texmf-dist/tex/luatex/optex/
-%doc %{_texdir}/texmf-dist/doc/luatex/optex/
-
 %files -n %{shortname}-patgen
 %license knuth.txt
 %{_bindir}/patgen
@@ -9142,26 +9118,21 @@ done <<< "$list"
 %doc %{_texdir}/texmf-dist/doc/latex/yplan/
 
 %changelog
-* Mon Nov 16 2020 Tom Callaway <spot@fedoraproject.org> - 9:20200327-22
-- make proper texlive-optex subpackage by moving it here
-- bump epoch to 9 so this texlive-optex package replaces the one that used to live in texlive
+* Tue Feb 2  2021 Tom Callaway <spot@fedoraproject.org> - 7:20200327-21
+- set TEXMFLOCAL during the context scriptlet to minimize the scope of where it looks during mtxrun --generate
 
-* Thu Nov 12 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-21
+* Tue Jan 26 2021 Tom Callaway <spot@fedoraproject.org> - 7:20200327-20
+- fix context shell binary to handle /home dirs that are symlinks (bz1913245)
+
+* Thu Dec 17 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-19
+- rebuild for newer clisp
+
+* Thu Nov 12 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-18
 - obsolete texlive-texconfig, texlive-pdftools, texlive-pstools (in texlive-texlive-scripts-extra)
 
-* Tue Nov 10 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-20
+* Tue Nov 10 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-17
 - fix issues with file ownership duplication
 - fix issue with obsoleting texlive-tetex
-- turn LTO back off, as it was assuming code needed libcrypto for some unknown reason
-
-* Thu Oct 29 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-19
-- fix dependencies of texlive-ptex and texlive-uptex
-
-* Sun Oct 11 2020 Jeff Law <law@redhat.com> - 7:20200327-18
-- Re-enable LTO
-
-* Wed Sep 23 2020 Than Ngo <than@redhat.com> - 7:20200327-17
-- Fix pdflatex run out of memory
 
 * Mon Sep 21 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-16
 - move "mtxrun --generate" call from -kpathsea transfiletriggerin to -context