From 16afd670b4abccaa87c6487d68ccb571942da65e Mon Sep 17 00:00:00 2001
From: Tom spot Callaway <spot@fedoraproject.org>
Date: Tue, 17 Nov 2020 09:57:27 -0500
Subject: [PATCH] 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        |  2 ++
 sources           |  2 ++
 texlive-base.spec | 37 +++++++++++++++++++++++++++++++++----
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 285acfb..207bcb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -396,3 +396,5 @@
 /psutils.tar.xz
 /xpdfopen.doc.tar.xz
 /texlive.tlpdb
+/optex.tar.xz
+/optex.doc.tar.xz
diff --git a/sources b/sources
index e5c60f6..9472891 100644
--- a/sources
+++ b/sources
@@ -384,3 +384,5 @@ 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
diff --git a/texlive-base.spec b/texlive-base.spec
index f1b9212..ec1842e 100644
--- a/texlive-base.spec
+++ b/texlive-base.spec
@@ -20,8 +20,8 @@
 
 Name: %{shortname}-base
 Version: %{source_date}
-Release: 21%{?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
@@ -4443,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}
@@ -8104,7 +8124,6 @@ done <<< "$list"
 %{_bindir}/dvilualatex-dev
 %{_bindir}/luacsplain
 %{_bindir}/luatex
-%{_bindir}/optex
 %{_bindir}/texlua
 %{_bindir}/texluac
 %{_mandir}/man1/dvilualatex-dev.1*
@@ -8116,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
@@ -8350,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
@@ -9117,6 +9142,10 @@ 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)