From 18cddc642e19a985d64429c30fd05f3c5336ebef Mon Sep 17 00:00:00 2001
From: Tom spot Callaway <spot@fedoraproject.org>
Date: Dec 30 2020 18:47:04 +0000
Subject: update pygmentex and dviasm, remove the last python2 dependencies here


---

diff --git a/sources b/sources
index 9472891..0184ad0 100644
--- a/sources
+++ b/sources
@@ -207,8 +207,6 @@ SHA512 (ptex-fontmaps.tar.xz) = 7e37ae074eaaea59387edb85169cc2cf8ed48b4cd1268d52
 SHA512 (ptex.tar.xz) = e3c386e5b97131f04e46bbd63c1c4b6d00b49110c7fc0cf072e50f44447c05653858d8baf31f5fbd5f6b199313fe00df8b0718f80a920f2b2b0ece340a29afff
 SHA512 (purifyeps.doc.tar.xz) = 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
 SHA512 (purifyeps.tar.xz) = 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
-SHA512 (pygmentex.doc.tar.xz) = effc3db243edd25d4aecf7c2de6eeeaa18ff085f6304bc390ee0276c07d7672d17202d8832a012e9fedcf3bbd16771aaf78a4262366744f5a27266693fb0e87d
-SHA512 (pygmentex.tar.xz) = d6e6327d0bce32aafb4be5a30eae63ab0418506367a4a18305f2fa45156b27911bf2cb945289323839c82bfacd6d8d3a588a302bff1cfc29911cf7d761d83cc9
 SHA512 (pythontex.doc.tar.xz) = cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4
 SHA512 (pythontex.tar.xz) = 27a3196f89ae04eb992817800f30dd26b275b65a2f9272907a2cc6a66708ee00290c3e0083bb537f0ee0152c93aee50728ea1ddab672aa08dfcef5f089bcf2b9
 SHA512 (rubik.doc.tar.xz) = 33d5c8210600cb4ce7b1313d1046f6644f0a6648f7ee9676d4d628d042f6501b5e92f2b56a31fbad6f637dc93a460a568be9e1335bd52bcea825f5772b2a9d51
@@ -346,8 +344,6 @@ SHA512 (dtxgen.doc.tar.xz) = f666a2b5d3cb32d43a23cc3edcd92bfb727d500a8c439b4b78b
 SHA512 (dtxgen.tar.xz) = b197684c1e941a64b606b472fb9e0f1ed4f5d0b0db2df59202712c0e3f3b3993106b8d493d707c4875e90dacd9dc7d12bba784ef7c8d04984a38708073b1b92d
 SHA512 (dvi2tty.doc.tar.xz) = fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900
 SHA512 (dvi2tty.tar.xz) = 303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72
-SHA512 (dviasm.doc.tar.xz) = a11c7b5e891958f10adf03812ff0a6123e8bff09410c4f9002e23d488956835019e5f54a5f130133f214831060992f2dcd7dc76b4497647b7005c704a7fa2d2b
-SHA512 (dviasm.tar.xz) = 4407c22869b64e8ced5e48c41d56495404bf665cf5b9d4d252b71cc4a868696ad2f3339c4c92aca354d5fea4ebef294509e282fbc87136b12565e6c3c2de43c4
 SHA512 (dvicopy.doc.tar.xz) = ec1751460032871c7b86e6438905f852f364ef8ba5128839c270f5fbe76a90b151a546709736e0cec104a29bbb9a883379b00f26fe3018142a5378cb9f5aa65f
 SHA512 (dvicopy.tar.xz) = 0deba8dd11640ec7bcf1043ef521f1252fe055cafcc1bb6680e9434672ee5db5a771e58b3c5e4cf15e59424b49fbdafeedd30594fdd1f72eed8134d8e52b6da3
 SHA512 (dvidvi.doc.tar.xz) = 865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646
@@ -386,3 +382,7 @@ SHA512 (texware.tar.xz) = b464059887713458ff20b9d002b567eba21863501470b654f02e51
 SHA512 (texlive.tlpdb) = 9405238da7ef41b22a9d1b4f32305856b1fc6efcebdb0dc5a9fceca9017e0a4fdbda3df58a37d64a753c003682965c8f6ffe388627d8a663578ee2b2e52ee1a6
 SHA512 (optex.tar.xz) = a418ee16b04ca307c623c5137c125a92dc098b0b3306e823e8e9e3e09db67b87d19b9afe18a213a36e80e3d94b1bf25b2926f715bfde962e9153e0ed8e0b84e1
 SHA512 (optex.doc.tar.xz) = 906021f9a639e222912d989d8f062568918029b896bbf9611bf58d4223635441f2179f121785385ec5147f132d01bc01f980f724434e7020c0675399e09797e0
+SHA512 (pygmentex.doc.tar.xz) = a4ef61d97ea11b6595ab94b68697091b88d4b1b83a150f7faf30863ef91e7d1681662410d7c45bad9426644b554fa078979d0a3b3c8baa11a6714d49b811f5d1
+SHA512 (pygmentex.tar.xz) = 6dc3ca792953c15b2777457b62a08c8d3b0275df8f8da9442590f61b64cc0640ddeebd7190375dfdb8d4bbc8582ed6da5ab7035bb0ff6617a27c2ddc0824d523
+SHA512 (dviasm.doc.tar.xz) = b2eecfcb0e665059843872426611e4a5c8092a2dfe51a82593803cb84b18147cd28fc18fe2d9575d24fac1b04501f1e90a2f9f3c4094d452bc51b3a4db603f9d
+SHA512 (dviasm.tar.xz) = 9f726816ddf7a52b797cfde03ffb863fa8a1b98068bc75da1ea86f57774bab248b4d4225f936b4cf3388dbb776e775527e4125ff5d49d76088e4f5be7125f4e6
diff --git a/texlive-base.spec b/texlive-base.spec
index ec1842e..47ec7a9 100644
--- a/texlive-base.spec
+++ b/texlive-base.spec
@@ -20,7 +20,7 @@
 
 Name: %{shortname}-base
 Version: %{source_date}
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch: 9
 Summary: TeX formatting system
 # The only files in the base package are directories, cache, and license texts
@@ -450,6 +450,8 @@ Patch28: texlive-base-20190410-CVE-2019-19601.patch
 Patch29: texlive-20200327-poppler-0.90.patch
 # Fix pdflatex run out of memory
 Patch30: texlive-base-20200327-out-of-memory.patch
+# Update bundled copy of dviasm to later version that supports python3
+Patch31: texlive-20200327-dviasm-py3.patch
 
 # Can't do this because it causes everything else to be noarch
 # BuildArch: noarch
@@ -6578,6 +6580,7 @@ xz -dc %{SOURCE0} | tar x
 %patch29 -p1 -b .poppler090
 %endif
 %patch30 -p1 -b .out_of_memory
+%patch31 -p1 -b .py3fix
 
 # Setup copies of the licenses
 for l in `unxz -c %{SOURCE3} | tar t`; do
@@ -6948,6 +6951,10 @@ pushd %{buildroot}
 find -type f -exec sed -i '1s|^#!/usr/bin/python$|#!%{__python3}|' {} +
 find -type f -exec sed -i '1s|^#!/usr/bin/env python$|#!%{__python3}|' {} +
 sed -i '1s|^#!/usr/bin/python |#!%{__python3} |' ./%{_texdir}/texmf-dist/scripts/de-macro/de-macro
+
+# Get rid of the python2 variant bits from pythontex (we need them to generate the py3 bits, but not in the package)
+rm -rf ./%{_texdir}/texmf-dist/scripts/pythontex/pythontex2.py
+rm -rf ./%{_texdir}/texmf-dist/scripts/pythontex/depythontex2.py
 popd
 
 # One dir to own
@@ -7576,6 +7583,7 @@ done <<< "$list"
 %files -n %{shortname}-dviasm
 %license gpl3.txt
 %{_bindir}/dviasm
+%{_mandir}/man1/dviasm.1*
 %{_texdir}/texmf-dist/scripts/dviasm/
 %doc %{_texdir}/texmf-dist/doc/latex/dviasm/
 
@@ -9142,6 +9150,10 @@ done <<< "$list"
 %doc %{_texdir}/texmf-dist/doc/latex/yplan/
 
 %changelog
+* Wed Dec 30 2020 Tom Callaway <spot@fedoraproject.org> - 9:20200327-23
+- update pygmentex (supports python3)
+- update dviasm (supports python3)
+
 * 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