diff --git a/.gitignore b/.gitignore index 0e55bf2..c684278 100644 --- a/.gitignore +++ b/.gitignore @@ -716,3 +716,7 @@ /xfrac.doc.tar.xz /xfrac.tar.xz /texlive-20240311-source-clean.tar.xz +/firstaid.tar.xz +/firstaid.doc.tar.xz +/hypcap.tar.xz +/hypcap.doc.tar.xz diff --git a/rpminspect.yaml b/rpminspect.yaml index 177f518..438fb42 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -62,11 +62,13 @@ xml: - /usr/share/texlive/texmf-dist/tex/context/modules/mkiv/x-ldx.ctx - /usr/share/texlive/texmf-dist/tex/context/modules/mkiv/x-pfsense.ctx - /usr/share/texlive/texmf-dist/tex/context/modules/mkiv/x-setups.ctx + - /usr/share/texlive/texmf-dist/doc/otherformats/xmltex/base/russiankoi8.xml unicode: # These files are source code samples and have known prohibited # code points. ignore: - - 'texlive-*/source/libs/icu/icu-src/source/extra/uconv/samples/utf8/many.txt' - - 'texlive-*/source/libs/icu/icu-src/source/test/testdata/letest.xml' - - 'texlive-*/source/libs/icu/icu-src/source/test/letest/gendata.xml' + - 'texlive-*/libs/icu/icu-src/source/extra/uconv/samples/utf8/many.txt' + - 'texlive-*/libs/icu/icu-src/source/test/testdata/letest.xml' + - 'texlive-*/libs/icu/icu-src/source/test/letest/gendata.xml' + - 'tex/generic/babel/locale/ar/*' diff --git a/sources b/sources index 924c7e3..50ef4a7 100644 --- a/sources +++ b/sources @@ -706,3 +706,7 @@ SHA512 (zapfding.tar.xz) = 3e0503c2d4e30c8d727caa1d9438d4c6b12c3a15729eae65d5c4a SHA512 (zref.doc.tar.xz) = 24cf22b54cb13e1458266f4962ba589fa9385f3b8d58493747824d815c372cfa6fa8a8a24d0310264b299ce43148ca001b5c6b73961d1504e1ab6e8a4ac246c0 SHA512 (zref.tar.xz) = 1c21d99dc4f1627520914ed3620606c724f22754662797b93c4161aaf3e36d5a42a586ae7e4b227cdf67d55c88d3979635e78661d7029f1a5967c503a9f9dde5 SHA512 (texlive-20240311-source-clean.tar.xz) = 3e8b0306d00747004308e39911f00f439ea0292b4d46b370b8d3652b00f546c3bf72563d67f6046d50419986bf6c89b71a41da7b1ed4ab99b36d4e5a443dd1f9 +SHA512 (firstaid.tar.xz) = f6beac36f7ecca6eb53097660270b3577bfaefb6dc2afd2b9d394d188e607515437041e93a84ce1d1fecfdff5f2d87380e62d4bdca3e627082a8dcc927ca7d7a +SHA512 (firstaid.doc.tar.xz) = 6b19546274da30daa03ff57873fe107e632e13fdf189c447ae3b9c4af56ec2874b2dfd2586e18be9845a7d7a77dfaddc16ecd3941adee7c33ecf04871f6617da +SHA512 (hypcap.tar.xz) = addf9ef94f61eb1516b6a3ef1bc7653b83133f2d4df5eb9d178f859a411d0dd8bc3c1b14b5657396860813069b32d78e78a6b26d88e546c011628e47a878ff5e +SHA512 (hypcap.doc.tar.xz) = 24cf7adb17e9cafe2ab0009feab695ea359167823e7bfd71806ab7b989187fd8752b55d1cbb96fa9eb180d87c736f9823e20e622519f9fe9ded162fb1758b694 diff --git a/texlive-2024-unicode.patch b/texlive-2024-unicode.patch deleted file mode 100644 index 58c9624..0000000 --- a/texlive-2024-unicode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf.me texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf ---- texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf.me 2024-10-07 22:02:16.819795966 +0200 -+++ texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf 2024-10-07 22:03:25.200232022 +0200 -@@ -190,7 +190,7 @@ - \def\tablename{\@ensure@RTL{جدول}}% - \def\partname{\@ensure@RTL{القسم}}% - \def\enclname{\@ensure@RTL{المرفقات}}%<-- Needs translation -- \def\ccname{\@ensure@RTL{نسخة ل‬}}% << -+ \def\ccname{\@ensure@RTL{نسخة لل}}% << - \def\headtoname{\@ensure@RTL{إلى}}%<-- Needs translation - \def\pagename{\@ensure@RTL{صفحة}}% - \def\seename{\@ensure@RTL{راجع}}%\alefhamza\nun\za\ra diff --git a/texlive.spec b/texlive.spec index c185e78..c31604a 100644 --- a/texlive.spec +++ b/texlive.spec @@ -23,7 +23,7 @@ %global __brp_mangle_shebangs_exclude ^$ # luajit only supports x86_64 -%global luajittex 1 +%global luajittex 0 %ifarch aarch64 %{power64} s390 s390x %global luajittex 0 %endif @@ -789,6 +789,10 @@ Source801: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/pdfmanag Source802: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.tar.xz Source803: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xfrac.tar.xz Source804: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/xfrac.doc.tar.xz +Source805: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/firstaid.tar.xz +Source806: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/firstaid.doc.tar.xz +Source807: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/hypcap.tar.xz +Source808: https://ctan.math.illinois.edu/systems/texlive/tlnet/archive/hypcap.doc.tar.xz Patch1: tl-kpfix.patch Patch2: tl-format.patch @@ -819,9 +823,6 @@ Patch37: texlive-base-libpaperv2.patch # Fix issue where off_t could be set incorrectly on i686 due to order of header load Patch44: texlive-base-20220321-pdf-header-order-fix.patch -# Fix unicode issue in polyglossia -Patch45: texlive-2024-unicode.patch - # Fix interpreter on perl scripts (thanks again to Debian) Patch46: texlive-base-20230311-fix-scripts.patch @@ -15668,6 +15669,7 @@ Requires: texlive-colortbl Requires: texlive-epstopdf-pkg Requires: texlive-etexcmds Requires: texlive-fancyhdr +Requires: texlive-firstaid Requires: texlive-fix2col Requires: texlive-geometry Requires: texlive-gettitlestring @@ -15693,6 +15695,7 @@ Requires: texlive-mfnfss Requires: texlive-mptopdf Requires: texlive-natbib Requires: texlive-oberdiek +Requires: texlive-hypcap Requires: texlive-pdfescape Requires: texlive-pslatex Requires: texlive-psnfss @@ -16056,6 +16059,8 @@ Requires: texlive-iftex Requires: texlive-kvoptions Requires: texlive-infwarerr Requires: texlive-pdftexcmds +# hypcap.sty is included separated hypcap package (texlive-2024) +Requires: texlive-hypcap # To complete the bundle Requires: tex(amsmath.sty) Requires: tex(array.sty) @@ -24369,6 +24374,39 @@ This is both a demonstration of the power of the template concept and also a useful addition to the available functionality in LaTeX2e +%package firstaid +Summary: First aid for external LaTeX files and packages that need updating +License: LPPL-1.3c +Requires: texlive-base >= %{epoch}:%{source_date}-%{release} +Requires: texlive-kpathsea >= %{epoch}:%{source_date}-%{release} +Provides: tex(underscore-ltx.sty) = %{tl_version} +Provides: tex(filehook-ltx.sty) = %{tl_version} +BuildArch: noarch + +%description firstaid +This package contains some first aid for LaTeX packages or +classes that require updates because of internal changes to the +LaTeX kernel that are not yet reflected in the package's or +class's code. The file latex2e-first-aid-for-external-files.ltx +provided by this package is meant to be loaded during format +generation and not by the user. + +%package hypcap +Summary: Adjusting the anchors of captions +License: LPPL-1.3c +Requires: texlive-base >= %{epoch}:%{source_date}-%{release} +Requires: texlive-kpathsea >= %{epoch}:%{source_date}-%{release} +Provides: tex(hypcap.sty) = %{tl_version} +BuildArch: noarch + +%description hypcap +The package offers a solution to the problem that when you link +to a float using hyperref, the link anchors to below the +float's caption, rather than the beginning of the float. Hypcap +defines a separate \capstart command, which you put where you +want links to end; you should have a \capstart command for each +\caption command. Package options can be used to auto-insert a +\capstart at the start of a float environment. %prep %setup -q -c -T @@ -24631,9 +24669,6 @@ patch -p1 < %{_sourcedir}/texlive-2024-fedora-texmfcnf.lua.patch # Fix interpreter on perl scripts patch -p1 < %{_sourcedir}/texlive-base-20230311-fix-scripts.patch - -# Fix unicode issue in polyglossia -patch -p1 < %{_sourcedir}/texlive-2024-unicode.patch popd # We want the texmf.cnf we patched, not the vanilla one from the kpathsea.tar.xz @@ -27770,7 +27805,23 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || : %doc %{_texdir}/texmf-dist/doc/latex/xfrac %{_texdir}/texmf-dist/tex/latex/xfrac +%files firstaid +%license lppl1.3c.txt +%doc %{_texdir}/texmf-dist/doc/latex/firstaid +%{_texdir}/texmf-dist/tex/latex/firstaid + +%files hypcap +%license lppl1.3c.txt +%doc %{_texdir}/texmf-dist/doc/latex/hypcap +%{_texdir}/texmf-dist/tex/latex/hypcap + %changelog +* Fri Nov 08 2024 Than Ngo - 13:202403 +- Add two subpackages for texlive 2024: firstaid, hypcap + can't find latex2e-first-aid-for-external-files.ltx file +- Drop luajittex +Resolves: RHEL-65862 + * Tue Oct 29 2024 Troy Dawson - 13:20240311-4 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018