From ebf8ab268f0f4981193f1b3cebbe2c0817861f61 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 1 Jul 2020 12:52:54 -0600 Subject: [PATCH 01/20] Disable LTO --- texlive-base.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 2124280..e08a110 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -6547,6 +6547,13 @@ 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} cat /usr/share/texlive/kpathsea.log || : # DEBUG @@ -9087,6 +9094,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Wed Jul 01 2020 Jeff Law - 7:20200327-7 +- Disable LTO + * Wed May 27 2020 Tom Callaway - 7:20200327-6 - split off context-doc (bz1839593) - add Requires: tex(psfonts.map) to gsftopk (bz1840379) From bb99836d975bed7c48faef5ccfca0e935fc1bdd1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 09:50:38 -0400 Subject: [PATCH 02/20] rebuild for poppler 0.90.0 --- texlive-base.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index e08a110..cfa3668 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9094,6 +9094,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 14 2020 Tom Callaway - 7:20200327-8 +- rebuild for poppler 0.90.0 + * Wed Jul 01 2020 Jeff Law - 7:20200327-7 - Disable LTO From fdec8bb18f1fe82c9c7d80a652742091dd701d06 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 09:56:54 -0400 Subject: [PATCH 03/20] bootstrap on --- texlive-base.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index cfa3668..53c507f 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -16,7 +16,7 @@ %global __brp_mangle_shebangs_exclude ^$ # We have a circular dep on latex due to xindy -%bcond_with bootstrap +%bcond_without bootstrap Name: %{shortname}-base Version: %{source_date} @@ -9096,6 +9096,7 @@ done <<< "$list" %changelog * Tue Jul 14 2020 Tom Callaway - 7:20200327-8 - rebuild for poppler 0.90.0 +- bootstrap on * Wed Jul 01 2020 Jeff Law - 7:20200327-7 - Disable LTO From 8ed27612c5bba3ee8368666422835ada761b3e87 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 10:05:00 -0400 Subject: [PATCH 04/20] fix bootstrap --- texlive-base.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/texlive-base.spec b/texlive-base.spec index 53c507f..9dea48c 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -1138,7 +1138,9 @@ Requires: texlive-kpathsea Requires(post,postun): coreutils Requires: texlive-metapost Requires: texlive-pdftex +%if %{without bootstrap} Requires: texlive-xetex +%endif Requires: texlive-luatex Requires: texlive-lm Requires: texlive-lm-math From ed52343074af88d70e638bc50c7c468bdb494cae Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 13:23:46 -0400 Subject: [PATCH 05/20] bootstrap again --- texlive-20200327-poppler-0.90.patch | 20 ++++++++++++++++++++ texlive-base.spec | 10 +++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 texlive-20200327-poppler-0.90.patch diff --git a/texlive-20200327-poppler-0.90.patch b/texlive-20200327-poppler-0.90.patch new file mode 100644 index 0000000..e76b436 --- /dev/null +++ b/texlive-20200327-poppler-0.90.patch @@ -0,0 +1,20 @@ +diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler090 texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc +--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler090 2020-07-14 13:13:31.620607263 -0400 ++++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc 2020-07-14 13:16:01.530248309 -0400 +@@ -766,7 +766,7 @@ read_pdf_info(char *image_name, char *pa + if (page_name) { + // get page by name + GString name(page_name); +- LinkDest *link = pdf_doc->doc->findDest(&name); ++ std::unique_ptr link = pdf_doc->doc->findDest(&name); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); + Ref ref = link->getPageRef(); +@@ -774,7 +774,6 @@ read_pdf_info(char *image_name, char *pa + if (page_num == 0) + pdftex_fail("PDF inclusion: destination is not a page <%s>", + page_name); +- delete link; + } else { + // get page by number + if (page_num <= 0 || page_num > epdf_num_pages) diff --git a/texlive-base.spec b/texlive-base.spec index 9dea48c..9b78113 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -444,6 +444,8 @@ Patch21: texlive-20190410-tlmgr-ignore-warning.patch Patch23: texlive-20200327-poppler-0.84.patch # bz#1798119, buffer overflow, CVE-2019-19601 Patch28: texlive-base-20190410-CVE-2019-19601.patch +# Fixes for poppler 0.90 (f33+) +Patch29: texlive-20200327-poppler-0.90.patch # Can't do this because it causes everything else to be noarch # BuildArch: noarch @@ -6537,6 +6539,9 @@ xz -dc %{SOURCE0} | tar x %patch23 -p1 -b .poppler-0.84 %endif %patch28 -p1 -b .CVE-2019-19601 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%patch29 -p1 -b .poppler090 +%endif # Setup copies of the licenses for l in `unxz -c %{SOURCE3} | tar t`; do @@ -9096,6 +9101,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 14 2020 Tom Callaway - 7:20200327-9 +- bootstrap again + * Tue Jul 14 2020 Tom Callaway - 7:20200327-8 - rebuild for poppler 0.90.0 - bootstrap on From 18657d209d6168825646c51cc05ee7c761e04927 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 13:35:12 -0400 Subject: [PATCH 06/20] tuck more into the bootstrap --- texlive-base.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 9b78113..ccc372d 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -1139,8 +1139,8 @@ Requires: texlive-base Requires: texlive-kpathsea Requires(post,postun): coreutils Requires: texlive-metapost -Requires: texlive-pdftex %if %{without bootstrap} +Requires: texlive-pdftex Requires: texlive-xetex %endif Requires: texlive-luatex @@ -6540,7 +6540,7 @@ xz -dc %{SOURCE0} | tar x %endif %patch28 -p1 -b .CVE-2019-19601 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -%patch29 -p1 -b .poppler090 +# %%patch29 -p1 -b .poppler090 %endif # Setup copies of the licenses From 3b4c0c38336e3f23f473d3e372ab911aa3c052da Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 14:34:23 -0400 Subject: [PATCH 07/20] bootstrap again again --- texlive-base.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index ccc372d..9a24cf0 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9101,6 +9101,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 14 2020 Tom Callaway - 7:20200327-10 +- bootstrap again again + * Tue Jul 14 2020 Tom Callaway - 7:20200327-9 - bootstrap again From 511e68a65d7b4abded700970f2f7cd6276e83e86 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 14:54:19 -0400 Subject: [PATCH 08/20] apply poppler 0.90 patch --- texlive-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 9a24cf0..7e8e82d 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -6540,7 +6540,7 @@ xz -dc %{SOURCE0} | tar x %endif %patch28 -p1 -b .CVE-2019-19601 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -# %%patch29 -p1 -b .poppler090 +%patch29 -p1 -b .poppler090 %endif # Setup copies of the licenses From af0d0090e7f92be2cb3f56f66618fb1023278a80 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 14 Jul 2020 16:20:02 -0400 Subject: [PATCH 09/20] disable bootstrap --- texlive-base.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 7e8e82d..10bd75d 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -16,11 +16,11 @@ %global __brp_mangle_shebangs_exclude ^$ # We have a circular dep on latex due to xindy -%bcond_without bootstrap +%bcond_with bootstrap Name: %{shortname}-base Version: %{source_date} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9101,6 +9101,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 14 2020 Tom Callaway - 7:20200327-11 +- disable bootstrap + * Tue Jul 14 2020 Tom Callaway - 7:20200327-10 - bootstrap again again From afafe9c2de60e33fb430f6928f089757e2c524ba Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Jul 2020 15:38:24 -0400 Subject: [PATCH 10/20] do a temporary unbootstrapped build to keep rawhide working while we wait on the side tag --- texlive-base.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 10bd75d..6c31f68 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 11%{?dist} +Release: 10%{?dist}.1 Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -6540,7 +6540,7 @@ xz -dc %{SOURCE0} | tar x %endif %patch28 -p1 -b .CVE-2019-19601 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -%patch29 -p1 -b .poppler090 +# %%patch29 -p1 -b .poppler090 %endif # Setup copies of the licenses @@ -9104,6 +9104,9 @@ done <<< "$list" * Tue Jul 14 2020 Tom Callaway - 7:20200327-11 - disable bootstrap +* Tue Jul 14 2020 Tom Callaway - 7:20200327-10.1 +- unbootstrapped build (TEMPORARY, when -11 comes out of the side tag, it will replace this) + * Tue Jul 14 2020 Tom Callaway - 7:20200327-10 - bootstrap again again From 33c272b88b13c97b20372b7b0d547d996b14c203 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Jul 2020 16:19:25 -0400 Subject: [PATCH 11/20] go back to -11 as latest commit --- texlive-base.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 6c31f68..f330a82 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 10%{?dist}.1 +Release: 11%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -6540,7 +6540,7 @@ xz -dc %{SOURCE0} | tar x %endif %patch28 -p1 -b .CVE-2019-19601 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -# %%patch29 -p1 -b .poppler090 +%patch29 -p1 -b .poppler090 %endif # Setup copies of the licenses From 4801f22956b819a2c7722483b7d29e0a353a7785 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 21 Jul 2020 12:03:14 +0200 Subject: [PATCH 12/20] rebuild for poppler 0.90.0 bodhi needs latest build --- texlive-base.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index f330a82..fa8b06e 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9101,6 +9101,10 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 21 2020 Marek Kasik - 7:20200327-12 +- rebuild for poppler 0.90.0 +- bodhi needs latest build + * Tue Jul 14 2020 Tom Callaway - 7:20200327-11 - disable bootstrap From 1050efcda3f1cbbed7dedfa24ee772cadbb343ce Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 22 Jul 2020 07:39:44 -0400 Subject: [PATCH 13/20] Use make macros --- texlive-base.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index fa8b06e..343a0ac 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -6632,7 +6632,7 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $i sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $i done -make world %{?_smp_mflags} STRIPPROG=/bin/true STRIP=/bin/true +%make_build world STRIPPROG=/bin/true STRIP=/bin/true %install # make directories @@ -9101,6 +9101,10 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Tue Jul 22 2020 Tom Stellard - 7:20200327-13 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Tue Jul 21 2020 Marek Kasik - 7:20200327-12 - rebuild for poppler 0.90.0 - bodhi needs latest build From dd50c75852e088f7bdc58011cdef15c63a041462 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:22:20 +0000 Subject: [PATCH 14/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- texlive-base.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 343a0ac..1b8346b 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -9101,6 +9101,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 7:20200327-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 22 2020 Tom Stellard - 7:20200327-13 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From d80de6cb62e66cdbbc679f34e43b3cf50c75ddb8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 13 Aug 2020 13:31:20 -0400 Subject: [PATCH 15/20] make texlive-latex have an explicit Requires on texlive-cm-super (bz1867927) --- texlive-base.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/texlive-base.spec b/texlive-base.spec index 1b8346b..4d0d8c4 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -2943,6 +2943,11 @@ Requires: texlive-luatex Requires: texlive-pdftex Requires: texlive-latexconfig Requires: texlive-latex-fonts +# As a result of changes in textcomp, it requests TS1 fonts for some things +# most notably, \textbullet. Since people probably want a working itemize +# even on rather minimal installs, we add an explicit Requires on texlive-cm-super +# here. (bz1867927) +Requires: texlive-cm-super Requires(post,postun): coreutils Requires: tex(multicol.sty) Requires: tex(url.sty) @@ -9101,6 +9106,9 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* Thu Aug 13 2020 Tom Callaway - 7:20200327-15 +- make texlive-latex have an explicit Requires on texlive-cm-super (bz1867927) + * Wed Jul 29 2020 Fedora Release Engineering - 7:20200327-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 789e234e56ca20090e17115af6f4e08e8a7d5860 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 21 Sep 2020 10:48:07 -0400 Subject: [PATCH 16/20] move "mtxrun --generate" call from -kpathsea transfiletriggerin to -context, drop Requires(post): texlive-context from -kpathsea --- texlive-base.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 4d0d8c4..7457567 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -20,7 +20,7 @@ Name: %{shortname}-base Version: %{source_date} -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 7 Summary: TeX formatting system # The only files in the base package are directories, cache, and license texts @@ -2875,7 +2875,6 @@ Requires: coreutils, grep Requires: texlive-base # We absolutely need this to go in first, since the trigger needs it Requires(post): texlive-texlive-scripts -Requires(post): texlive-context Provides: tex(fmtutil.cnf) = %{epoch}:%{source_date}-%{release} Provides: tex(mktex.cnf) = %{epoch}:%{source_date}-%{release} Provides: tex(texmf.cnf) = %{epoch}:%{source_date}-%{release} @@ -6973,6 +6972,9 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then fi : +%transfiletriggerin -n %{shortname}-context -- %{_texdir} +%{_bindir}/mtxrun --generate &> /dev/null || : + %transfiletriggerin -n %{shortname}-kpathsea -- %{_texdir} # Commented lines are DEBUG mode # touch /usr/share/texlive/kpathsea.log @@ -6983,9 +6985,7 @@ fi export TEXMF=/usr/share/texlive/texmf-dist export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c export TEXMFCACHE=/var/lib/texmf -# %{_bindir}/mtxrun --generate 2>&1 | tee -a /usr/share/texlive/kpathsea.log || : # %{_bindir}/fmtutil-sys --all 2>&1 | tee -a /usr/share/texlive/kpathsea.log || : -%{_bindir}/mtxrun --generate &> /dev/null || : %{_bindir}/fmtutil-sys --all &> /dev/null || : %transfiletriggerpostun -n %{shortname}-kpathsea -- %{_texdir} @@ -9106,6 +9106,10 @@ done <<< "$list" %doc %{_texdir}/texmf-dist/doc/latex/yplan/ %changelog +* 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 + * Thu Aug 13 2020 Tom Callaway - 7:20200327-15 - make texlive-latex have an explicit Requires on texlive-cm-super (bz1867927) From 64ee65584f42b6cd9cc605e81b77ec74156431c1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 21 Sep 2020 11:07:03 -0400 Subject: [PATCH 17/20] add an explicit versioning on the dependency of texlive-texlive-scripts in -kpathsea (and vice versa) --- texlive-base.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/texlive-base.spec b/texlive-base.spec index 7457567..ca7b5db 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -2874,7 +2874,7 @@ Obsoletes: texlive-kpathsea-doc < 7:20170520 Requires: coreutils, grep Requires: texlive-base # We absolutely need this to go in first, since the trigger needs it -Requires(post): texlive-texlive-scripts +Requires(post): texlive-texlive-scripts = %{epoch}:%{source_date}-%{release} Provides: tex(fmtutil.cnf) = %{epoch}:%{source_date}-%{release} Provides: tex(mktex.cnf) = %{epoch}:%{source_date}-%{release} Provides: tex(texmf.cnf) = %{epoch}:%{source_date}-%{release} @@ -5645,7 +5645,7 @@ Obsoletes: texlive-texlive-scripts-bin < 7:20170520 License: LPPL Summary: TeX Live infrastructure programs Requires: texlive-base -Requires: texlive-kpathsea +Requires: texlive-kpathsea = %{epoch}:%{source_date}-%{release} Requires: texlive-texlive.infra # perl BuildArch: noarch @@ -9109,6 +9109,7 @@ done <<< "$list" * 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 +- add an explicit versioning on the dependency of texlive-texlive-scripts in -kpathsea (and vice versa) * Thu Aug 13 2020 Tom Callaway - 7:20200327-15 - make texlive-latex have an explicit Requires on texlive-cm-super (bz1867927) @@ -9116,7 +9117,7 @@ done <<< "$list" * Wed Jul 29 2020 Fedora Release Engineering - 7:20200327-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Tue Jul 22 2020 Tom Stellard - 7:20200327-13 +* Wed Jul 22 2020 Tom Stellard - 7:20200327-13 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From cea90058634a507d6ccba7ff86d006c3645c8ea6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 17 Oct 2020 17:33:30 -0400 Subject: [PATCH 18/20] 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 19/20] 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 20/20] 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