From 0feb5ab88b2a2f6a9bb7c032cd9dc8f86876ddcd Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 3 Nov 2024 15:47:33 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    | 101 ++++++++++++++++++++++++++++++---
 comps-rocky-10-lh.xml.in | 118 ++++++++++++++++++++++++++++-----------
 comps-rocky-9-lh.xml     |   7 +++
 comps-rocky-9-lh.xml.in  |   7 +++
 4 files changed, 192 insertions(+), 41 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index ea831ac..ecfbf32 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -1205,9 +1205,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>texlive</packagereq>
+      <packagereq>texlive-acronym</packagereq>
       <packagereq>texlive-adjustbox</packagereq>
       <packagereq>texlive-ae</packagereq>
       <packagereq>texlive-algorithms</packagereq>
+      <packagereq>texlive-alphalph</packagereq>
       <packagereq>texlive-amscls</packagereq>
       <packagereq>texlive-amsfonts</packagereq>
       <packagereq>texlive-amsmath</packagereq>
@@ -1215,7 +1217,11 @@
       <packagereq>texlive-anysize</packagereq>
       <packagereq>texlive-appendix</packagereq>
       <packagereq>texlive-arphic</packagereq>
+      <packagereq>texlive-atbegshi</packagereq>
       <packagereq>texlive-attachfile</packagereq>
+      <packagereq>texlive-attachfile2</packagereq>
+      <packagereq>texlive-atveryend</packagereq>
+      <packagereq>texlive-auxhook</packagereq>
       <packagereq>texlive-avantgar</packagereq>
       <packagereq>texlive-awesomebox</packagereq>
       <packagereq>texlive-babel</packagereq>
@@ -1228,13 +1234,17 @@
       <packagereq>texlive-bibtopic</packagereq>
       <packagereq>texlive-bidi</packagereq>
       <packagereq>texlive-bigfoot</packagereq>
+      <packagereq>texlive-bigintcalc</packagereq>
+      <packagereq>texlive-bitset</packagereq>
       <packagereq>texlive-bookman</packagereq>
+      <packagereq>texlive-bookmark</packagereq>
       <packagereq>texlive-booktabs</packagereq>
       <packagereq>texlive-breakurl</packagereq>
       <packagereq>texlive-breqn</packagereq>
       <packagereq>texlive-capt-of</packagereq>
       <packagereq>texlive-caption</packagereq>
       <packagereq>texlive-carlisle</packagereq>
+      <packagereq>texlive-catchfile</packagereq>
       <packagereq>texlive-changebar</packagereq>
       <packagereq>texlive-changepage</packagereq>
       <packagereq>texlive-charter</packagereq>
@@ -1254,7 +1264,10 @@
       <packagereq>texlive-collection-latex</packagereq>
       <packagereq>texlive-collection-latexrecommended</packagereq>
       <packagereq>texlive-collection-xetex</packagereq>
+      <packagereq>texlive-colorprofiles</packagereq>
       <packagereq>texlive-colortbl</packagereq>
+      <packagereq>texlive-context</packagereq>
+      <packagereq>texlive-count1to</packagereq>
       <packagereq>texlive-courier</packagereq>
       <packagereq>texlive-crop</packagereq>
       <packagereq>texlive-csquotes</packagereq>
@@ -1262,6 +1275,7 @@
       <packagereq>texlive-ctablestack</packagereq>
       <packagereq>texlive-currfile</packagereq>
       <packagereq>texlive-datetime</packagereq>
+      <packagereq>texlive-dehyph</packagereq>
       <packagereq>texlive-ec</packagereq>
       <packagereq>texlive-eepic</packagereq>
       <packagereq>texlive-enctex</packagereq>
@@ -1269,15 +1283,20 @@
       <packagereq>texlive-environ</packagereq>
       <packagereq>texlive-epsf</packagereq>
       <packagereq>texlive-epstopdf</packagereq>
+      <packagereq>texlive-epstopdf-pkg</packagereq>
       <packagereq>texlive-eqparbox</packagereq>
       <packagereq>texlive-eso-pic</packagereq>
       <packagereq>texlive-etex</packagereq>
       <packagereq>texlive-etex-pkg</packagereq>
+      <packagereq>texlive-etexcmds</packagereq>
+      <packagereq>texlive-etoc</packagereq>
       <packagereq>texlive-etoolbox</packagereq>
       <packagereq>texlive-euenc</packagereq>
       <packagereq>texlive-euler</packagereq>
       <packagereq>texlive-euro</packagereq>
       <packagereq>texlive-eurosym</packagereq>
+      <packagereq>texlive-everysel</packagereq>
+      <packagereq>texlive-everyshi</packagereq>
       <packagereq>texlive-extsizes</packagereq>
       <packagereq>texlive-fancybox</packagereq>
       <packagereq>texlive-fancyhdr</packagereq>
@@ -1297,28 +1316,39 @@
       <packagereq>texlive-fontspec</packagereq>
       <packagereq>texlive-fontwrap</packagereq>
       <packagereq>texlive-footmisc</packagereq>
+      <packagereq>texlive-footnotehyper</packagereq>
       <packagereq>texlive-fp</packagereq>
       <packagereq>texlive-fpl</packagereq>
       <packagereq>texlive-framed</packagereq>
       <packagereq>texlive-garuda-c90</packagereq>
       <packagereq>texlive-geometry</packagereq>
+      <packagereq>texlive-gettitlestring</packagereq>
       <packagereq>texlive-glyphlist</packagereq>
       <packagereq>texlive-graphics</packagereq>
       <packagereq>texlive-graphics-cfg</packagereq>
       <packagereq>texlive-graphics-def</packagereq>
+      <packagereq>texlive-grfext</packagereq>
+      <packagereq>texlive-grffile</packagereq>
+      <packagereq>texlive-hanging</packagereq>
       <packagereq>texlive-helvetic</packagereq>
+      <packagereq>texlive-hobsub</packagereq>
+      <packagereq>texlive-hologo</packagereq>
+      <packagereq>texlive-hopatch</packagereq>
+      <packagereq>texlive-hycolor</packagereq>
+      <packagereq>texlive-hypdoc</packagereq>
       <packagereq>texlive-hyperref</packagereq>
       <packagereq>texlive-hyph-utf8</packagereq>
       <packagereq>texlive-hyphen-base</packagereq>
       <packagereq>texlive-hyphenat</packagereq>
-      <packagereq>texlive-ifetex</packagereq>
-      <packagereq>texlive-ifluatex</packagereq>
+      <packagereq>texlive-hyphenex</packagereq>
       <packagereq>texlive-ifmtarg</packagereq>
       <packagereq>texlive-ifoddpage</packagereq>
+      <packagereq>texlive-ifplatform</packagereq>
       <packagereq>texlive-iftex</packagereq>
-      <packagereq>texlive-ifxetex</packagereq>
       <packagereq>texlive-import</packagereq>
       <packagereq>texlive-index</packagereq>
+      <packagereq>texlive-infwarerr</packagereq>
+      <packagereq>texlive-intcalc</packagereq>
       <packagereq>texlive-jadetex</packagereq>
       <packagereq>texlive-jknapltx</packagereq>
       <packagereq>texlive-kastrup</packagereq>
@@ -1326,6 +1356,10 @@
       <packagereq>texlive-knuth-lib</packagereq>
       <packagereq>texlive-knuth-local</packagereq>
       <packagereq>texlive-koma-script</packagereq>
+      <packagereq>texlive-kvdefinekeys</packagereq>
+      <packagereq>texlive-kvoptions</packagereq>
+      <packagereq>texlive-kvsetkeys</packagereq>
+      <packagereq>texlive-l3backend</packagereq>
       <packagereq>texlive-l3experimental</packagereq>
       <packagereq>texlive-l3kernel</packagereq>
       <packagereq>texlive-l3packages</packagereq>
@@ -1333,21 +1367,27 @@
       <packagereq>texlive-latex</packagereq>
       <packagereq>texlive-latex-fonts</packagereq>
       <packagereq>texlive-latex2man</packagereq>
+      <packagereq>texlive-latexbug</packagereq>
       <packagereq>texlive-latexconfig</packagereq>
+      <packagereq>texlive-letltxmacro</packagereq>
       <packagereq>texlive-lettrine</packagereq>
       <packagereq>texlive-linegoal</packagereq>
       <packagereq>texlive-lineno</packagereq>
       <packagereq>texlive-listings</packagereq>
+      <packagereq>texlive-listofitems</packagereq>
       <packagereq>texlive-lm</packagereq>
       <packagereq>texlive-lm-math</packagereq>
       <packagereq>texlive-ltabptch</packagereq>
+      <packagereq>texlive-ltxcmds</packagereq>
       <packagereq>texlive-ltxmisc</packagereq>
       <packagereq>texlive-lua-alt-getopt</packagereq>
+      <packagereq>texlive-lua-uni-algos</packagereq>
       <packagereq>texlive-lualatex-math</packagereq>
       <packagereq>texlive-lualibs</packagereq>
       <packagereq>texlive-luaotfload</packagereq>
       <packagereq>texlive-luatex85</packagereq>
       <packagereq>texlive-luatexbase</packagereq>
+      <packagereq>texlive-lwarp</packagereq>
       <packagereq>texlive-makecmds</packagereq>
       <packagereq>texlive-manfnt-font</packagereq>
       <packagereq>texlive-marginnote</packagereq>
@@ -1362,17 +1402,22 @@
       <packagereq>texlive-mflogo-font</packagereq>
       <packagereq>texlive-mfnfss</packagereq>
       <packagereq>texlive-microtype</packagereq>
+      <packagereq>texlive-minitoc</packagereq>
       <packagereq>texlive-mnsymbol</packagereq>
+      <packagereq>texlive-modes</packagereq>
       <packagereq>texlive-mparhack</packagereq>
       <packagereq>texlive-mptopdf</packagereq>
-      <packagereq>texlive-ms</packagereq>
       <packagereq>texlive-multido</packagereq>
       <packagereq>texlive-multirow</packagereq>
+      <packagereq>texlive-multitoc</packagereq>
       <packagereq>texlive-natbib</packagereq>
       <packagereq>texlive-ncctools</packagereq>
       <packagereq>texlive-ncntrsbk</packagereq>
       <packagereq>texlive-needspace</packagereq>
+      <packagereq>texlive-newfloat</packagereq>
+      <packagereq>texlive-newunicodechar</packagereq>
       <packagereq>texlive-norasi-c90</packagereq>
+      <packagereq>texlive-notoccite</packagereq>
       <packagereq>texlive-ntgclass</packagereq>
       <packagereq>texlive-oberdiek</packagereq>
       <packagereq>texlive-overpic</packagereq>
@@ -1381,10 +1426,18 @@
       <packagereq>texlive-parallel</packagereq>
       <packagereq>texlive-parskip</packagereq>
       <packagereq>texlive-passivetex</packagereq>
+      <packagereq>texlive-pdfcol</packagereq>
+      <packagereq>texlive-pdfcolfoot</packagereq>
+      <packagereq>texlive-pdfcolmk</packagereq>
+      <packagereq>texlive-pdfescape</packagereq>
+      <packagereq>texlive-pdflscape</packagereq>
+      <packagereq>texlive-pdfmanagement-testphase</packagereq>
       <packagereq>texlive-pdfpages</packagereq>
+      <packagereq>texlive-pdftexcmds</packagereq>
       <packagereq>texlive-pgf</packagereq>
       <packagereq>texlive-philokalia</packagereq>
       <packagereq>texlive-placeins</packagereq>
+      <packagereq>texlive-plain</packagereq>
       <packagereq>texlive-polyglossia</packagereq>
       <packagereq>texlive-powerdot</packagereq>
       <packagereq>texlive-preprint</packagereq>
@@ -1393,6 +1446,7 @@
       <packagereq>texlive-psnfss</packagereq>
       <packagereq>texlive-pspicture</packagereq>
       <packagereq>texlive-pst-3d</packagereq>
+      <packagereq>texlive-pst-arrow</packagereq>
       <packagereq>texlive-pst-blur</packagereq>
       <packagereq>texlive-pst-coil</packagereq>
       <packagereq>texlive-pst-eps</packagereq>
@@ -1403,16 +1457,22 @@
       <packagereq>texlive-pst-plot</packagereq>
       <packagereq>texlive-pst-slpe</packagereq>
       <packagereq>texlive-pst-text</packagereq>
+      <packagereq>texlive-pst-tools</packagereq>
       <packagereq>texlive-pst-tree</packagereq>
       <packagereq>texlive-pstricks</packagereq>
       <packagereq>texlive-pstricks-add</packagereq>
       <packagereq>texlive-ptext</packagereq>
       <packagereq>texlive-pxfonts</packagereq>
       <packagereq>texlive-qstest</packagereq>
+      <packagereq>texlive-ragged2e</packagereq>
       <packagereq>texlive-rcs</packagereq>
       <packagereq>texlive-realscripts</packagereq>
+      <packagereq>texlive-refcount</packagereq>
+      <packagereq>texlive-relsize</packagereq>
+      <packagereq>texlive-rerunfilecheck</packagereq>
       <packagereq>texlive-rsfs</packagereq>
       <packagereq>texlive-sansmath</packagereq>
+      <packagereq>texlive-sansmathaccent</packagereq>
       <packagereq>texlive-sauerj</packagereq>
       <packagereq>texlive-scheme-basic</packagereq>
       <packagereq>texlive-section</packagereq>
@@ -1420,9 +1480,12 @@
       <packagereq>texlive-seminar</packagereq>
       <packagereq>texlive-sepnum</packagereq>
       <packagereq>texlive-setspace</packagereq>
+      <packagereq>texlive-sfmath</packagereq>
       <packagereq>texlive-showexpl</packagereq>
       <packagereq>texlive-soul</packagereq>
+      <packagereq>texlive-stackengine</packagereq>
       <packagereq>texlive-stmaryrd</packagereq>
+      <packagereq>texlive-stringenc</packagereq>
       <packagereq>texlive-subfig</packagereq>
       <packagereq>texlive-subfigure</packagereq>
       <packagereq>texlive-svn-prov</packagereq>
@@ -1430,7 +1493,6 @@
       <packagereq>texlive-t2</packagereq>
       <packagereq>texlive-tabu</packagereq>
       <packagereq>texlive-tabulary</packagereq>
-      <packagereq>texlive-tetex</packagereq>
       <packagereq>texlive-tex-gyre</packagereq>
       <packagereq>texlive-tex-gyre-math</packagereq>
       <packagereq>texlive-tex-ini-files</packagereq>
@@ -1438,6 +1500,7 @@
       <packagereq>texlive-texlive-en</packagereq>
       <packagereq>texlive-texlive-msg-translations</packagereq>
       <packagereq>texlive-texlive-scripts</packagereq>
+      <packagereq>texlive-texlive-scripts-extra</packagereq>
       <packagereq>texlive-texlive.infra</packagereq>
       <packagereq>texlive-textcase</packagereq>
       <packagereq>texlive-textpos</packagereq>
@@ -1449,10 +1512,12 @@
       <packagereq>texlive-titling</packagereq>
       <packagereq>texlive-tocloft</packagereq>
       <packagereq>texlive-tools</packagereq>
+      <packagereq>texlive-translator</packagereq>
       <packagereq>texlive-trimspaces</packagereq>
       <packagereq>texlive-txfonts</packagereq>
       <packagereq>texlive-type1cm</packagereq>
       <packagereq>texlive-typehtml</packagereq>
+      <packagereq>texlive-ucharcat</packagereq>
       <packagereq>texlive-ucharclasses</packagereq>
       <packagereq>texlive-ucs</packagereq>
       <packagereq>texlive-uhc</packagereq>
@@ -1460,6 +1525,7 @@
       <packagereq>texlive-underscore</packagereq>
       <packagereq>texlive-unicode-data</packagereq>
       <packagereq>texlive-unicode-math</packagereq>
+      <packagereq>texlive-uniquecounter</packagereq>
       <packagereq>texlive-unisugar</packagereq>
       <packagereq>texlive-upquote</packagereq>
       <packagereq>texlive-url</packagereq>
@@ -1468,6 +1534,7 @@
       <packagereq>texlive-wadalab</packagereq>
       <packagereq>texlive-was</packagereq>
       <packagereq>texlive-wasy</packagereq>
+      <packagereq>texlive-wasy-type1</packagereq>
       <packagereq>texlive-wasysym</packagereq>
       <packagereq>texlive-wrapfig</packagereq>
       <packagereq>texlive-xcolor</packagereq>
@@ -1480,16 +1547,18 @@
       <packagereq>texlive-xetex-pstricks</packagereq>
       <packagereq>texlive-xetexconfig</packagereq>
       <packagereq>texlive-xetexfontinfo</packagereq>
+      <packagereq>texlive-xfrac</packagereq>
       <packagereq>texlive-xifthen</packagereq>
       <packagereq>texlive-xkeyval</packagereq>
       <packagereq>texlive-xltxtra</packagereq>
       <packagereq>texlive-xmltex</packagereq>
-      <packagereq>texlive-xmltexconfig</packagereq>
+      <packagereq>texlive-xpatch</packagereq>
       <packagereq>texlive-xstring</packagereq>
       <packagereq>texlive-xtab</packagereq>
       <packagereq>texlive-xunicode</packagereq>
       <packagereq>texlive-zapfchan</packagereq>
       <packagereq>texlive-zapfding</packagereq>
+      <packagereq>texlive-zref</packagereq>
       <packagereq>texlive-bibtex</packagereq>
       <packagereq>texlive-dvipdfmx</packagereq>
       <packagereq>texlive-dvipng</packagereq>
@@ -1499,6 +1568,7 @@
       <packagereq>texlive-gsftopk</packagereq>
       <packagereq>texlive-kpathsea</packagereq>
       <packagereq>texlive-lib</packagereq>
+      <packagereq>texlive-luahbtex</packagereq>
       <packagereq>texlive-luatex</packagereq>
       <packagereq>texlive-makeindex</packagereq>
       <packagereq>texlive-metafont</packagereq>
@@ -1835,6 +1905,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="default">java-21-openjdk-devel</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-javadoc</packagereq>
+      <packagereq type="default">java-21-openjdk-javadoc-zip</packagereq>
+      <packagereq type="default">java-21-openjdk-jmods</packagereq>
+      <packagereq type="default">java-21-openjdk-src</packagereq>
+      <packagereq type="default">java-21-openjdk-static-libs</packagereq>
       <packagereq type="default">ant</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
@@ -1859,7 +1936,16 @@
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
-  
+  <group variant="AppStream">
+    <id>java-platform</id>
+    <name>Java Platform</name>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">java-21-openjdk</packagereq>
+    </packagelist>
+  </group>
   <group variant="AppStream">
     <id>input-methods</id>
     <name>Input Methods</name>
@@ -3140,7 +3226,6 @@
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
       <packagereq type="default">zziplib-devel</packagereq>
       <packagereq type="default">egl-wayland-devel</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index afe5e02..40a61aa 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -1218,9 +1218,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>texlive</packagereq>
+      <packagereq>texlive-acronym</packagereq>
       <packagereq>texlive-adjustbox</packagereq>
       <packagereq>texlive-ae</packagereq>
       <packagereq>texlive-algorithms</packagereq>
+      <packagereq>texlive-alphalph</packagereq>
       <packagereq>texlive-amscls</packagereq>
       <packagereq>texlive-amsfonts</packagereq>
       <packagereq>texlive-amsmath</packagereq>
@@ -1228,7 +1230,11 @@
       <packagereq>texlive-anysize</packagereq>
       <packagereq>texlive-appendix</packagereq>
       <packagereq>texlive-arphic</packagereq>
+      <packagereq>texlive-atbegshi</packagereq>
       <packagereq>texlive-attachfile</packagereq>
+      <packagereq>texlive-attachfile2</packagereq>
+      <packagereq>texlive-atveryend</packagereq>
+      <packagereq>texlive-auxhook</packagereq>
       <packagereq>texlive-avantgar</packagereq>
       <packagereq>texlive-awesomebox</packagereq>
       <packagereq>texlive-babel</packagereq>
@@ -1241,13 +1247,17 @@
       <packagereq>texlive-bibtopic</packagereq>
       <packagereq>texlive-bidi</packagereq>
       <packagereq>texlive-bigfoot</packagereq>
+      <packagereq>texlive-bigintcalc</packagereq>
+      <packagereq>texlive-bitset</packagereq>
       <packagereq>texlive-bookman</packagereq>
+      <packagereq>texlive-bookmark</packagereq>
       <packagereq>texlive-booktabs</packagereq>
       <packagereq>texlive-breakurl</packagereq>
       <packagereq>texlive-breqn</packagereq>
       <packagereq>texlive-capt-of</packagereq>
       <packagereq>texlive-caption</packagereq>
       <packagereq>texlive-carlisle</packagereq>
+      <packagereq>texlive-catchfile</packagereq>
       <packagereq>texlive-changebar</packagereq>
       <packagereq>texlive-changepage</packagereq>
       <packagereq>texlive-charter</packagereq>
@@ -1267,7 +1277,10 @@
       <packagereq>texlive-collection-latex</packagereq>
       <packagereq>texlive-collection-latexrecommended</packagereq>
       <packagereq>texlive-collection-xetex</packagereq>
+      <packagereq>texlive-colorprofiles</packagereq>
       <packagereq>texlive-colortbl</packagereq>
+      <packagereq>texlive-context</packagereq>
+      <packagereq>texlive-count1to</packagereq>
       <packagereq>texlive-courier</packagereq>
       <packagereq>texlive-crop</packagereq>
       <packagereq>texlive-csquotes</packagereq>
@@ -1275,6 +1288,7 @@
       <packagereq>texlive-ctablestack</packagereq>
       <packagereq>texlive-currfile</packagereq>
       <packagereq>texlive-datetime</packagereq>
+      <packagereq>texlive-dehyph</packagereq>
       <packagereq>texlive-ec</packagereq>
       <packagereq>texlive-eepic</packagereq>
       <packagereq>texlive-enctex</packagereq>
@@ -1282,15 +1296,20 @@
       <packagereq>texlive-environ</packagereq>
       <packagereq>texlive-epsf</packagereq>
       <packagereq>texlive-epstopdf</packagereq>
+      <packagereq>texlive-epstopdf-pkg</packagereq>
       <packagereq>texlive-eqparbox</packagereq>
       <packagereq>texlive-eso-pic</packagereq>
       <packagereq>texlive-etex</packagereq>
       <packagereq>texlive-etex-pkg</packagereq>
+      <packagereq>texlive-etexcmds</packagereq>
+      <packagereq>texlive-etoc</packagereq>
       <packagereq>texlive-etoolbox</packagereq>
       <packagereq>texlive-euenc</packagereq>
       <packagereq>texlive-euler</packagereq>
       <packagereq>texlive-euro</packagereq>
       <packagereq>texlive-eurosym</packagereq>
+      <packagereq>texlive-everysel</packagereq>
+      <packagereq>texlive-everyshi</packagereq>
       <packagereq>texlive-extsizes</packagereq>
       <packagereq>texlive-fancybox</packagereq>
       <packagereq>texlive-fancyhdr</packagereq>
@@ -1310,28 +1329,39 @@
       <packagereq>texlive-fontspec</packagereq>
       <packagereq>texlive-fontwrap</packagereq>
       <packagereq>texlive-footmisc</packagereq>
+      <packagereq>texlive-footnotehyper</packagereq>
       <packagereq>texlive-fp</packagereq>
       <packagereq>texlive-fpl</packagereq>
       <packagereq>texlive-framed</packagereq>
       <packagereq>texlive-garuda-c90</packagereq>
       <packagereq>texlive-geometry</packagereq>
+      <packagereq>texlive-gettitlestring</packagereq>
       <packagereq>texlive-glyphlist</packagereq>
       <packagereq>texlive-graphics</packagereq>
       <packagereq>texlive-graphics-cfg</packagereq>
       <packagereq>texlive-graphics-def</packagereq>
+      <packagereq>texlive-grfext</packagereq>
+      <packagereq>texlive-grffile</packagereq>
+      <packagereq>texlive-hanging</packagereq>
       <packagereq>texlive-helvetic</packagereq>
+      <packagereq>texlive-hobsub</packagereq>
+      <packagereq>texlive-hologo</packagereq>
+      <packagereq>texlive-hopatch</packagereq>
+      <packagereq>texlive-hycolor</packagereq>
+      <packagereq>texlive-hypdoc</packagereq>
       <packagereq>texlive-hyperref</packagereq>
       <packagereq>texlive-hyph-utf8</packagereq>
       <packagereq>texlive-hyphen-base</packagereq>
       <packagereq>texlive-hyphenat</packagereq>
-      <packagereq>texlive-ifetex</packagereq>
-      <packagereq>texlive-ifluatex</packagereq>
+      <packagereq>texlive-hyphenex</packagereq>
       <packagereq>texlive-ifmtarg</packagereq>
       <packagereq>texlive-ifoddpage</packagereq>
+      <packagereq>texlive-ifplatform</packagereq>
       <packagereq>texlive-iftex</packagereq>
-      <packagereq>texlive-ifxetex</packagereq>
       <packagereq>texlive-import</packagereq>
       <packagereq>texlive-index</packagereq>
+      <packagereq>texlive-infwarerr</packagereq>
+      <packagereq>texlive-intcalc</packagereq>
       <packagereq>texlive-jadetex</packagereq>
       <packagereq>texlive-jknapltx</packagereq>
       <packagereq>texlive-kastrup</packagereq>
@@ -1339,6 +1369,10 @@
       <packagereq>texlive-knuth-lib</packagereq>
       <packagereq>texlive-knuth-local</packagereq>
       <packagereq>texlive-koma-script</packagereq>
+      <packagereq>texlive-kvdefinekeys</packagereq>
+      <packagereq>texlive-kvoptions</packagereq>
+      <packagereq>texlive-kvsetkeys</packagereq>
+      <packagereq>texlive-l3backend</packagereq>
       <packagereq>texlive-l3experimental</packagereq>
       <packagereq>texlive-l3kernel</packagereq>
       <packagereq>texlive-l3packages</packagereq>
@@ -1346,21 +1380,27 @@
       <packagereq>texlive-latex</packagereq>
       <packagereq>texlive-latex-fonts</packagereq>
       <packagereq>texlive-latex2man</packagereq>
+      <packagereq>texlive-latexbug</packagereq>
       <packagereq>texlive-latexconfig</packagereq>
+      <packagereq>texlive-letltxmacro</packagereq>
       <packagereq>texlive-lettrine</packagereq>
       <packagereq>texlive-linegoal</packagereq>
       <packagereq>texlive-lineno</packagereq>
       <packagereq>texlive-listings</packagereq>
+      <packagereq>texlive-listofitems</packagereq>
       <packagereq>texlive-lm</packagereq>
       <packagereq>texlive-lm-math</packagereq>
       <packagereq>texlive-ltabptch</packagereq>
+      <packagereq>texlive-ltxcmds</packagereq>
       <packagereq>texlive-ltxmisc</packagereq>
       <packagereq>texlive-lua-alt-getopt</packagereq>
+      <packagereq>texlive-lua-uni-algos</packagereq>
       <packagereq>texlive-lualatex-math</packagereq>
       <packagereq>texlive-lualibs</packagereq>
       <packagereq>texlive-luaotfload</packagereq>
       <packagereq>texlive-luatex85</packagereq>
       <packagereq>texlive-luatexbase</packagereq>
+      <packagereq>texlive-lwarp</packagereq>
       <packagereq>texlive-makecmds</packagereq>
       <packagereq>texlive-manfnt-font</packagereq>
       <packagereq>texlive-marginnote</packagereq>
@@ -1375,17 +1415,22 @@
       <packagereq>texlive-mflogo-font</packagereq>
       <packagereq>texlive-mfnfss</packagereq>
       <packagereq>texlive-microtype</packagereq>
+      <packagereq>texlive-minitoc</packagereq>
       <packagereq>texlive-mnsymbol</packagereq>
+      <packagereq>texlive-modes</packagereq>
       <packagereq>texlive-mparhack</packagereq>
       <packagereq>texlive-mptopdf</packagereq>
-      <packagereq>texlive-ms</packagereq>
       <packagereq>texlive-multido</packagereq>
       <packagereq>texlive-multirow</packagereq>
+      <packagereq>texlive-multitoc</packagereq>
       <packagereq>texlive-natbib</packagereq>
       <packagereq>texlive-ncctools</packagereq>
       <packagereq>texlive-ncntrsbk</packagereq>
       <packagereq>texlive-needspace</packagereq>
+      <packagereq>texlive-newfloat</packagereq>
+      <packagereq>texlive-newunicodechar</packagereq>
       <packagereq>texlive-norasi-c90</packagereq>
+      <packagereq>texlive-notoccite</packagereq>
       <packagereq>texlive-ntgclass</packagereq>
       <packagereq>texlive-oberdiek</packagereq>
       <packagereq>texlive-overpic</packagereq>
@@ -1394,10 +1439,18 @@
       <packagereq>texlive-parallel</packagereq>
       <packagereq>texlive-parskip</packagereq>
       <packagereq>texlive-passivetex</packagereq>
+      <packagereq>texlive-pdfcol</packagereq>
+      <packagereq>texlive-pdfcolfoot</packagereq>
+      <packagereq>texlive-pdfcolmk</packagereq>
+      <packagereq>texlive-pdfescape</packagereq>
+      <packagereq>texlive-pdflscape</packagereq>
+      <packagereq>texlive-pdfmanagement-testphase</packagereq>
       <packagereq>texlive-pdfpages</packagereq>
+      <packagereq>texlive-pdftexcmds</packagereq>
       <packagereq>texlive-pgf</packagereq>
       <packagereq>texlive-philokalia</packagereq>
       <packagereq>texlive-placeins</packagereq>
+      <packagereq>texlive-plain</packagereq>
       <packagereq>texlive-polyglossia</packagereq>
       <packagereq>texlive-powerdot</packagereq>
       <packagereq>texlive-preprint</packagereq>
@@ -1406,6 +1459,7 @@
       <packagereq>texlive-psnfss</packagereq>
       <packagereq>texlive-pspicture</packagereq>
       <packagereq>texlive-pst-3d</packagereq>
+      <packagereq>texlive-pst-arrow</packagereq>
       <packagereq>texlive-pst-blur</packagereq>
       <packagereq>texlive-pst-coil</packagereq>
       <packagereq>texlive-pst-eps</packagereq>
@@ -1416,16 +1470,22 @@
       <packagereq>texlive-pst-plot</packagereq>
       <packagereq>texlive-pst-slpe</packagereq>
       <packagereq>texlive-pst-text</packagereq>
+      <packagereq>texlive-pst-tools</packagereq>
       <packagereq>texlive-pst-tree</packagereq>
       <packagereq>texlive-pstricks</packagereq>
       <packagereq>texlive-pstricks-add</packagereq>
       <packagereq>texlive-ptext</packagereq>
       <packagereq>texlive-pxfonts</packagereq>
       <packagereq>texlive-qstest</packagereq>
+      <packagereq>texlive-ragged2e</packagereq>
       <packagereq>texlive-rcs</packagereq>
       <packagereq>texlive-realscripts</packagereq>
+      <packagereq>texlive-refcount</packagereq>
+      <packagereq>texlive-relsize</packagereq>
+      <packagereq>texlive-rerunfilecheck</packagereq>
       <packagereq>texlive-rsfs</packagereq>
       <packagereq>texlive-sansmath</packagereq>
+      <packagereq>texlive-sansmathaccent</packagereq>
       <packagereq>texlive-sauerj</packagereq>
       <packagereq>texlive-scheme-basic</packagereq>
       <packagereq>texlive-section</packagereq>
@@ -1433,9 +1493,12 @@
       <packagereq>texlive-seminar</packagereq>
       <packagereq>texlive-sepnum</packagereq>
       <packagereq>texlive-setspace</packagereq>
+      <packagereq>texlive-sfmath</packagereq>
       <packagereq>texlive-showexpl</packagereq>
       <packagereq>texlive-soul</packagereq>
+      <packagereq>texlive-stackengine</packagereq>
       <packagereq>texlive-stmaryrd</packagereq>
+      <packagereq>texlive-stringenc</packagereq>
       <packagereq>texlive-subfig</packagereq>
       <packagereq>texlive-subfigure</packagereq>
       <packagereq>texlive-svn-prov</packagereq>
@@ -1443,7 +1506,6 @@
       <packagereq>texlive-t2</packagereq>
       <packagereq>texlive-tabu</packagereq>
       <packagereq>texlive-tabulary</packagereq>
-      <packagereq>texlive-tetex</packagereq>
       <packagereq>texlive-tex-gyre</packagereq>
       <packagereq>texlive-tex-gyre-math</packagereq>
       <packagereq>texlive-tex-ini-files</packagereq>
@@ -1451,6 +1513,7 @@
       <packagereq>texlive-texlive-en</packagereq>
       <packagereq>texlive-texlive-msg-translations</packagereq>
       <packagereq>texlive-texlive-scripts</packagereq>
+      <packagereq>texlive-texlive-scripts-extra</packagereq>
       <packagereq>texlive-texlive.infra</packagereq>
       <packagereq>texlive-textcase</packagereq>
       <packagereq>texlive-textpos</packagereq>
@@ -1462,10 +1525,12 @@
       <packagereq>texlive-titling</packagereq>
       <packagereq>texlive-tocloft</packagereq>
       <packagereq>texlive-tools</packagereq>
+      <packagereq>texlive-translator</packagereq>
       <packagereq>texlive-trimspaces</packagereq>
       <packagereq>texlive-txfonts</packagereq>
       <packagereq>texlive-type1cm</packagereq>
       <packagereq>texlive-typehtml</packagereq>
+      <packagereq>texlive-ucharcat</packagereq>
       <packagereq>texlive-ucharclasses</packagereq>
       <packagereq>texlive-ucs</packagereq>
       <packagereq>texlive-uhc</packagereq>
@@ -1473,6 +1538,7 @@
       <packagereq>texlive-underscore</packagereq>
       <packagereq>texlive-unicode-data</packagereq>
       <packagereq>texlive-unicode-math</packagereq>
+      <packagereq>texlive-uniquecounter</packagereq>
       <packagereq>texlive-unisugar</packagereq>
       <packagereq>texlive-upquote</packagereq>
       <packagereq>texlive-url</packagereq>
@@ -1481,6 +1547,7 @@
       <packagereq>texlive-wadalab</packagereq>
       <packagereq>texlive-was</packagereq>
       <packagereq>texlive-wasy</packagereq>
+      <packagereq>texlive-wasy-type1</packagereq>
       <packagereq>texlive-wasysym</packagereq>
       <packagereq>texlive-wrapfig</packagereq>
       <packagereq>texlive-xcolor</packagereq>
@@ -1493,16 +1560,18 @@
       <packagereq>texlive-xetex-pstricks</packagereq>
       <packagereq>texlive-xetexconfig</packagereq>
       <packagereq>texlive-xetexfontinfo</packagereq>
+      <packagereq>texlive-xfrac</packagereq>
       <packagereq>texlive-xifthen</packagereq>
       <packagereq>texlive-xkeyval</packagereq>
       <packagereq>texlive-xltxtra</packagereq>
       <packagereq>texlive-xmltex</packagereq>
-      <packagereq>texlive-xmltexconfig</packagereq>
+      <packagereq>texlive-xpatch</packagereq>
       <packagereq>texlive-xstring</packagereq>
       <packagereq>texlive-xtab</packagereq>
       <packagereq>texlive-xunicode</packagereq>
       <packagereq>texlive-zapfchan</packagereq>
       <packagereq>texlive-zapfding</packagereq>
+      <packagereq>texlive-zref</packagereq>
       <packagereq>texlive-bibtex</packagereq>
       <packagereq>texlive-dvipdfmx</packagereq>
       <packagereq>texlive-dvipng</packagereq>
@@ -1512,6 +1581,7 @@
       <packagereq>texlive-gsftopk</packagereq>
       <packagereq>texlive-kpathsea</packagereq>
       <packagereq>texlive-lib</packagereq>
+      <packagereq>texlive-luahbtex</packagereq>
       <packagereq>texlive-luatex</packagereq>
       <packagereq>texlive-makeindex</packagereq>
       <packagereq>texlive-metafont</packagereq>
@@ -1899,27 +1969,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <!-- Disable java until we have Java 21 which is what we'll ship in Rocky Linux
-      <packagereq type="default">java-1.8.0-openjdk-devel</packagereq>
-      <packagereq type="default">java-1.8.0-openjdk-demo</packagereq>
-      <packagereq type="default">java-1.8.0-openjdk-javadoc</packagereq>
-      <packagereq type="default">java-1.8.0-openjdk-javadoc-zip</packagereq>
-      <packagereq type="default">java-1.8.0-openjdk-src</packagereq>
-      <packagereq type="default">java-11-openjdk-devel</packagereq>
-      <packagereq type="default">java-11-openjdk-demo</packagereq>
-      <packagereq type="default">java-11-openjdk-javadoc</packagereq>
-      <packagereq type="default">java-11-openjdk-javadoc-zip</packagereq>
-      <packagereq type="default">java-11-openjdk-jmods</packagereq>
-      <packagereq type="default">java-11-openjdk-src</packagereq>
-      <packagereq type="default">java-11-openjdk-static-libs</packagereq>
-      <packagereq type="default">java-17-openjdk-devel</packagereq>
-      <packagereq type="default">java-17-openjdk-demo</packagereq>
-      <packagereq type="default">java-17-openjdk-javadoc</packagereq>
-      <packagereq type="default">java-17-openjdk-javadoc-zip</packagereq>
-      <packagereq type="default">java-17-openjdk-jmods</packagereq>
-      <packagereq type="default">java-17-openjdk-src</packagereq>
-      <packagereq type="default">java-17-openjdk-static-libs</packagereq>
-      -->
+      <packagereq type="default">java-21-openjdk-devel</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-javadoc</packagereq>
+      <packagereq type="default">java-21-openjdk-javadoc-zip</packagereq>
+      <packagereq type="default">java-21-openjdk-jmods</packagereq>
+      <packagereq type="default">java-21-openjdk-src</packagereq>
+      <packagereq type="default">java-21-openjdk-static-libs</packagereq>
       <packagereq type="default">ant</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
@@ -1944,7 +2000,6 @@
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
-  <!-- Disable java until we have Java 21 which is what we'll ship in Rocky Linux
   <group variant="AppStream">
     <id>java-platform</id>
     <_name>Java Platform</_name>
@@ -1952,12 +2007,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">java-1.8.0-openjdk</packagereq>
-      <packagereq type="default">java-11-openjdk</packagereq>
-      <packagereq type="default">java-17-openjdk</packagereq>
+      <packagereq type="default">java-21-openjdk</packagereq>
     </packagelist>
   </group>
-  -->
   <group variant="AppStream">
     <id>input-methods</id>
     <_name>Input Methods</_name>
@@ -3367,7 +3419,6 @@
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
       <packagereq type="default">zziplib-devel</packagereq>
       <packagereq type="default">egl-wayland-devel</packagereq>
@@ -4032,6 +4083,7 @@
       <groupid>java-platform</groupid>
     </grouplist>
     <optionlist>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>smart-card</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index ebdd30c..4f238a6 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2030,8 +2030,15 @@
       <packagereq type="default">java-17-openjdk-src</packagereq>
       <packagereq type="default">java-17-openjdk-static-libs</packagereq>
       <packagereq type="default">maven</packagereq>
+      <packagereq type="default">maven-openjdk8</packagereq>
       <packagereq type="default">maven-openjdk11</packagereq>
+      <packagereq type="default">maven-openjdk17</packagereq>
+      <packagereq type="default">maven-openjdk21</packagereq>
       <packagereq type="default">ant</packagereq>
+      <packagereq type="default">ant-openjdk8</packagereq>
+      <packagereq type="default">ant-openjdk11</packagereq>
+      <packagereq type="default">ant-openjdk17</packagereq>
+      <packagereq type="default">ant-openjdk21</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
       <packagereq type="default">ant-apache-bsf</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index ff9f34d..72d19c4 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -2093,8 +2093,15 @@
       <packagereq type="default">java-17-openjdk-src</packagereq>
       <packagereq type="default">java-17-openjdk-static-libs</packagereq>
       <packagereq type="default">maven</packagereq>
+      <packagereq type="default">maven-openjdk8</packagereq>
       <packagereq type="default">maven-openjdk11</packagereq>
+      <packagereq type="default">maven-openjdk17</packagereq>
+      <packagereq type="default">maven-openjdk21</packagereq>
       <packagereq type="default">ant</packagereq>
+      <packagereq type="default">ant-openjdk8</packagereq>
+      <packagereq type="default">ant-openjdk11</packagereq>
+      <packagereq type="default">ant-openjdk17</packagereq>
+      <packagereq type="default">ant-openjdk21</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
       <packagereq type="default">ant-apache-bsf</packagereq>