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

.gitignore

@@ -395,3 +395,6 @@
 /psutils.doc.tar.xz
 /psutils.tar.xz
 /xpdfopen.doc.tar.xz
+/texlive.tlpdb
+/optex.tar.xz
+/optex.doc.tar.xz

sources

@@ -383,3 +383,6 @@ SHA512 (texlive-scripts.doc.tar.xz) = 839e621da34395756da2b87c32146bfbd87790ad76
 SHA512 (texlive-scripts.tar.xz) = 824dcfa175efa8d1d0d2196cac51afeed0ef81e5497c144d6101a3edb234261c118aeaef0716def828c7d576f36497e7faac0afa2646020a398aa78c99dcbbe2
 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

@@ -0,0 +1,12 @@
+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: 16%{?dist}
-Epoch: 7
+Release: 22%{?dist}
+Epoch: 9
 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,6 +417,8 @@ 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
@@ -446,6 +448,8 @@ 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
@@ -4441,6 +4445,24 @@ 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}
@@ -5010,7 +5032,6 @@ 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
@@ -5647,6 +5668,8 @@ Summary: TeX Live infrastructure programs
 Requires: texlive-base
 Requires: texlive-kpathsea = %{epoch}:%{source_date}-%{release}
 Requires: texlive-texlive.infra
+Provides: texlive-tetex = %{epoch}:%{source_date}-%{release}
+Obsoletes: texlive-tetex < 7:20200327
 # perl
 BuildArch: noarch
 
@@ -5662,6 +5685,9 @@ Summary: TeX Live scripts
 Requires: texlive-base
 Requires: texlive-kpathsea
 Requires: texlive-texlive.infra
+Obsoletes: texlive-texconfig < 7:20200327
+Obsoletes: texlive-pstools < 7:20200327
+Obsoletes: texlive-pdftools < 7:20200327
 # perl and shell
 BuildArch: noarch
 
@@ -6003,12 +6029,17 @@ 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-ptex
+Requires: texlive-plain
+Requires: texlive-ptex-base
+Requires: texlive-uptex-base
+Requires: texlive-uptex-fonts
 
 %description -n %{shortname}-uptex
 upTeX is an extension of pTeX, using UTF-8 input and producing UTF-8 
@@ -6546,6 +6577,7 @@ 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
@@ -6558,11 +6590,6 @@ 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}
@@ -7398,8 +7425,10 @@ done <<< "$list"
 %{_texdir}/texmf-dist/fonts/tfm/hoekwater/context/
 %{_texdir}/texmf-dist/fonts/type1/hoekwater/context/
 %{_texdir}/texmf-dist/metapost/context/
+%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/
 %{_texdir}/texmf-dist/tex/latex/context/
 %{fmtutil_cnf_d}/context
@@ -8095,7 +8124,6 @@ done <<< "$list"
 %{_bindir}/dvilualatex-dev
 %{_bindir}/luacsplain
 %{_bindir}/luatex
-%{_bindir}/optex
 %{_bindir}/texlua
 %{_bindir}/texluac
 %{_mandir}/man1/dvilualatex-dev.1*
@@ -8107,7 +8135,6 @@ 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
@@ -8140,6 +8167,7 @@ done <<< "$list"
 %{_bindir}/mkindex
 %{_mandir}/man1/makeindex.1*
 %{_mandir}/man1/mkindex.1*
+%exclude %{_texdir}/texmf-dist/makeindex/latex/
 %{_texdir}/texmf-dist/makeindex/
 %{_texdir}/texmf-dist/tex/plain/makeindex/
 %doc %{_texdir}/texmf-dist/doc/support/makeindex/
@@ -8182,6 +8210,7 @@ done <<< "$list"
 %{_texdir}/texmf-dist/fonts/map/dvips/metapost/
 %{_texdir}/texmf-dist/fonts/tfm/metapost/
 %{_texdir}/texmf-dist/fonts/type1/metapost/
+%exclude %{_texdir}/texmf-dist/metapost/context/
 %{_texdir}/texmf-dist/metapost/
 %{_texdir}/texmf-dist/tex/generic/metapost/
 %doc %{_texdir}/texmf-dist/doc/metapost/
@@ -8339,6 +8368,13 @@ 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
@@ -9106,6 +9142,27 @@ 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
+
+* Thu Nov 12 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-21
+- obsolete texlive-texconfig, texlive-pdftools, texlive-pstools (in texlive-texlive-scripts-extra)
+
+* Tue Nov 10 2020 Tom Callaway <spot@fedoraproject.org> - 7:20200327-20
+- 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
 - drop Requires(post): texlive-context from -kpathsea