From cea90058634a507d6ccba7ff86d006c3645c8ea6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 17 Oct 2020 17:33:30 -0400 Subject: [PATCH 1/6] move texlive.tlpbd to lookaside cache --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3cd3e16..285acfb 100644 --- a/.gitignore +++ b/.gitignore @@ -395,3 +395,4 @@ /psutils.doc.tar.xz /psutils.tar.xz /xpdfopen.doc.tar.xz +/texlive.tlpdb diff --git a/sources b/sources index 7072996..e5c60f6 100644 --- a/sources +++ b/sources @@ -383,3 +383,4 @@ 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 From eb3aa412a5afe958b7c167b08d6a4348cb957e72 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 10 Nov 2020 17:14:03 -0500 Subject: [PATCH 2/6] fix issues with file ownership duplication, fix issue with obsoleting texlive-tetex --- texlive-base.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index ca7b5db..be9a54a 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -5647,6 +5647,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 @@ -7398,9 +7400,11 @@ 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/ %{_texdir}/texmf-dist/tex/generic/context/ +%exclude %{_texdir}/texmf-dist/tex/generic/context/mptopdf %{_texdir}/texmf-dist/tex/latex/context/ %{fmtutil_cnf_d}/context @@ -8140,6 +8144,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 +8187,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/ @@ -9106,6 +9112,10 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Nov 10 2020 Tom Callaway - 7:20200327-17 +- fix issues with file ownership duplication +- fix issue with obsoleting texlive-tetex + * Mon Sep 21 2020 Tom Callaway - 7:20200327-16 - move "mtxrun --generate" call from -kpathsea transfiletriggerin to -context - drop Requires(post): texlive-context from -kpathsea From 185596382a4b964f3a5d98a125a5091aedac6f44 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 12 Nov 2020 11:26:28 -0500 Subject: [PATCH 3/6] obsolete texlive-texconfig, texlive-pdftools, texlive-pstools (in texlive-texlive-scripts-extra) --- texlive-base.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index be9a54a..aa7e872 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -5664,6 +5664,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 @@ -9112,6 +9115,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Thu Nov 12 2020 Tom Callaway - 7:20200327-18 +- obsolete texlive-texconfig, texlive-pdftools, texlive-pstools (in texlive-texlive-scripts-extra) + * Tue Nov 10 2020 Tom Callaway - 7:20200327-17 - fix issues with file ownership duplication - fix issue with obsoleting texlive-tetex From aa303fe2fbcd68de7c3d4bfcf28f70933b590403 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 17 Dec 2020 15:54:34 -0500 Subject: [PATCH 4/6] rebuild for newer clisp --- texlive-base.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index aa7e872..a4e6d14 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9115,6 +9115,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Thu Dec 17 2020 Tom Callaway - 7:20200327-19 +- rebuild for newer clisp + * Thu Nov 12 2020 Tom Callaway - 7:20200327-18 - obsolete texlive-texconfig, texlive-pdftools, texlive-pstools (in texlive-texlive-scripts-extra) From 805aea97b5d0affbe3c625b565d0bc6d0bbf8518 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 26 Jan 2021 10:25:41 -0500 Subject: [PATCH 5/6] fix context shell binary to handle /home dirs that are symlinks (bz1913245) --- texlive-base.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index a4e6d14..2c57b4f 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -1137,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} @@ -6892,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 @@ -9115,6 +9117,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jan 26 2021 Tom Callaway - 7:20200327-20 +- fix context shell binary to handle /home dirs that are symlinks (bz1913245) + * Thu Dec 17 2020 Tom Callaway - 7:20200327-19 - rebuild for newer clisp From 532cc2be6195801a0b0118a89181c176bd72aa77 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 2 Feb 2021 12:58:08 -0500 Subject: [PATCH 6/6] set TEXMFLOCAL during the context scriptlet to minimize the scope of where it looks during mtxrun --generate --- texlive-base.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 2c57b4f..d827d45 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -6980,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} @@ -9117,6 +9118,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Feb 2 2021 Tom Callaway - 7:20200327-21 +- set TEXMFLOCAL during the context scriptlet to minimize the scope of where it looks during mtxrun --generate + * Tue Jan 26 2021 Tom Callaway - 7:20200327-20 - fix context shell binary to handle /home dirs that are symlinks (bz1913245)