From 802e382b7ca42193d1909622eef5312196bb12e6 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 4 Nov 2024 13:24:29 -0700
Subject: [PATCH] update catalog

---
 autocatalog.cfg             |  31 +++-------
 comps/AppStream-aarch64.xml | 104 +++++++++++++++++++++++++++++---
 comps/AppStream-ppc64le.xml | 116 +++++++++++++++++++++++++++++-------
 comps/AppStream-s390x.xml   | 104 +++++++++++++++++++++++++++++---
 comps/AppStream-x86_64.xml  | 116 +++++++++++++++++++++++++++++-------
 comps/BaseOS-aarch64.xml    |   2 +-
 comps/BaseOS-ppc64le.xml    |   2 +-
 comps/BaseOS-s390x.xml      |   2 +-
 comps/BaseOS-x86_64.xml     |   2 +-
 comps/CRB-aarch64.xml       |   3 +-
 comps/CRB-ppc64le.xml       |   3 +-
 comps/CRB-s390x.xml         |   3 +-
 comps/CRB-x86_64.xml        |   3 +-
 hidden.cfg                  |  15 +++++
 14 files changed, 420 insertions(+), 86 deletions(-)

diff --git a/autocatalog.cfg b/autocatalog.cfg
index 520ec0a..0cadb8e 100644
--- a/autocatalog.cfg
+++ b/autocatalog.cfg
@@ -6,6 +6,7 @@ exclude_filter {
     glob_match: "kernel-rt*"
     glob_match: "javapackages-bootstrap"
     glob_match: "scl-utils"
+    glob_match: "yajl*"
   }
 }
 exclude_filter {
@@ -13,6 +14,7 @@ exclude_filter {
   arch {
     key: "*"
     glob_match: "pyproject-rpm-macros"
+    glob_match: "llvm-libs"
   }
 }
 exclude_filter {
@@ -15049,7 +15051,6 @@ package {
     include_filter: "llvm-devel.aarch64"
     include_filter: "llvm-doc.noarch"
     include_filter: "llvm-googletest.aarch64"
-    include_filter: "llvm-libs.aarch64"
     include_filter: "llvm-static.aarch64"
     include_filter: "llvm-test.aarch64"
     include_filter: "llvm-toolset.aarch64"
@@ -15073,7 +15074,6 @@ package {
     include_filter: "lldb.ppc64le"
     include_filter: "llvm-devel.ppc64le"
     include_filter: "llvm-googletest.ppc64le"
-    include_filter: "llvm-libs.ppc64le"
     include_filter: "llvm-static.ppc64le"
     include_filter: "llvm-test.ppc64le"
     include_filter: "llvm-toolset.ppc64le"
@@ -15094,7 +15094,6 @@ package {
     include_filter: "lldb.s390x"
     include_filter: "llvm-devel.s390x"
     include_filter: "llvm-googletest.s390x"
-    include_filter: "llvm-libs.s390x"
     include_filter: "llvm-static.s390x"
     include_filter: "llvm-test.s390x"
     include_filter: "llvm-toolset.s390x"
@@ -15117,7 +15116,6 @@ package {
     include_filter: "lldb.x86_64"
     include_filter: "llvm-devel.x86_64"
     include_filter: "llvm-googletest.x86_64"
-    include_filter: "llvm-libs.x86_64"
     include_filter: "llvm-static.x86_64"
     include_filter: "llvm-test.x86_64"
     include_filter: "llvm-toolset.x86_64"
@@ -15125,6 +15123,13 @@ package {
     include_filter: "python3-clang.x86_64"
     include_filter: "python3-lldb.x86_64"
   }
+  repository {
+    name: "BaseOS"
+    include_filter: "llvm-libs.aarch64"
+    include_filter: "llvm-libs.ppc64le"
+    include_filter: "llvm-libs.s390x"
+    include_filter: "llvm-libs.x86_64"
+  }
 }
 package {
   name: "lm_sensors"
@@ -27055,24 +27060,6 @@ package {
     include_filter: "xz-java-javadoc.noarch"
   }
 }
-package {
-  name: "yajl"
-  type: PACKAGE_TYPE_NORMAL_FORK
-  repository {
-    name: "AppStream"
-    include_filter: "yajl.aarch64"
-    include_filter: "yajl.ppc64le"
-    include_filter: "yajl.s390x"
-    include_filter: "yajl.x86_64"
-  }
-  repository {
-    name: "CRB"
-    include_filter: "yajl-devel.aarch64"
-    include_filter: "yajl-devel.ppc64le"
-    include_filter: "yajl-devel.s390x"
-    include_filter: "yajl-devel.x86_64"
-  }
-}
 package {
   name: "yara"
   type: PACKAGE_TYPE_NORMAL_FORK
diff --git a/comps/AppStream-aarch64.xml b/comps/AppStream-aarch64.xml
index 5902e1a..c17865a 100644
--- a/comps/AppStream-aarch64.xml
+++ b/comps/AppStream-aarch64.xml
@@ -362,7 +362,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -563,11 +563,28 @@
       <packagereq type="default">ant-swing</packagereq>
       <packagereq type="default">ant-testutil</packagereq>
       <packagereq type="default">ant-xz</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-devel</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">log4j</packagereq>
       <packagereq type="default">log4j-jcl</packagereq>
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>java-platform</id>
+    <name>Java Platform</name>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">java-21-openjdk</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <name>Mail Server</name>
@@ -903,7 +920,7 @@
   <group>
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
-    <description/>
+    <description>Remote desktop app supporting RDP</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1042,9 +1059,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">texlive</packagereq>
+      <packagereq type="mandatory">texlive-acronym</packagereq>
       <packagereq type="mandatory">texlive-adjustbox</packagereq>
       <packagereq type="mandatory">texlive-ae</packagereq>
       <packagereq type="mandatory">texlive-algorithms</packagereq>
+      <packagereq type="mandatory">texlive-alphalph</packagereq>
       <packagereq type="mandatory">texlive-amscls</packagereq>
       <packagereq type="mandatory">texlive-amsfonts</packagereq>
       <packagereq type="mandatory">texlive-amsmath</packagereq>
@@ -1052,7 +1071,11 @@
       <packagereq type="mandatory">texlive-anysize</packagereq>
       <packagereq type="mandatory">texlive-appendix</packagereq>
       <packagereq type="mandatory">texlive-arphic</packagereq>
+      <packagereq type="mandatory">texlive-atbegshi</packagereq>
       <packagereq type="mandatory">texlive-attachfile</packagereq>
+      <packagereq type="mandatory">texlive-attachfile2</packagereq>
+      <packagereq type="mandatory">texlive-atveryend</packagereq>
+      <packagereq type="mandatory">texlive-auxhook</packagereq>
       <packagereq type="mandatory">texlive-avantgar</packagereq>
       <packagereq type="mandatory">texlive-awesomebox</packagereq>
       <packagereq type="mandatory">texlive-babel</packagereq>
@@ -1066,13 +1089,17 @@
       <packagereq type="mandatory">texlive-bibtopic</packagereq>
       <packagereq type="mandatory">texlive-bidi</packagereq>
       <packagereq type="mandatory">texlive-bigfoot</packagereq>
+      <packagereq type="mandatory">texlive-bigintcalc</packagereq>
+      <packagereq type="mandatory">texlive-bitset</packagereq>
       <packagereq type="mandatory">texlive-bookman</packagereq>
+      <packagereq type="mandatory">texlive-bookmark</packagereq>
       <packagereq type="mandatory">texlive-booktabs</packagereq>
       <packagereq type="mandatory">texlive-breakurl</packagereq>
       <packagereq type="mandatory">texlive-breqn</packagereq>
       <packagereq type="mandatory">texlive-capt-of</packagereq>
       <packagereq type="mandatory">texlive-caption</packagereq>
       <packagereq type="mandatory">texlive-carlisle</packagereq>
+      <packagereq type="mandatory">texlive-catchfile</packagereq>
       <packagereq type="mandatory">texlive-changebar</packagereq>
       <packagereq type="mandatory">texlive-changepage</packagereq>
       <packagereq type="mandatory">texlive-charter</packagereq>
@@ -1092,7 +1119,10 @@
       <packagereq type="mandatory">texlive-collection-latex</packagereq>
       <packagereq type="mandatory">texlive-collection-latexrecommended</packagereq>
       <packagereq type="mandatory">texlive-collection-xetex</packagereq>
+      <packagereq type="mandatory">texlive-colorprofiles</packagereq>
       <packagereq type="mandatory">texlive-colortbl</packagereq>
+      <packagereq type="mandatory">texlive-context</packagereq>
+      <packagereq type="mandatory">texlive-count1to</packagereq>
       <packagereq type="mandatory">texlive-courier</packagereq>
       <packagereq type="mandatory">texlive-crop</packagereq>
       <packagereq type="mandatory">texlive-csquotes</packagereq>
@@ -1100,6 +1130,7 @@
       <packagereq type="mandatory">texlive-ctablestack</packagereq>
       <packagereq type="mandatory">texlive-currfile</packagereq>
       <packagereq type="mandatory">texlive-datetime</packagereq>
+      <packagereq type="mandatory">texlive-dehyph</packagereq>
       <packagereq type="mandatory">texlive-dvipdfmx</packagereq>
       <packagereq type="mandatory">texlive-dvipng</packagereq>
       <packagereq type="mandatory">texlive-dvips</packagereq>
@@ -1111,15 +1142,20 @@
       <packagereq type="mandatory">texlive-environ</packagereq>
       <packagereq type="mandatory">texlive-epsf</packagereq>
       <packagereq type="mandatory">texlive-epstopdf</packagereq>
+      <packagereq type="mandatory">texlive-epstopdf-pkg</packagereq>
       <packagereq type="mandatory">texlive-eqparbox</packagereq>
       <packagereq type="mandatory">texlive-eso-pic</packagereq>
       <packagereq type="mandatory">texlive-etex</packagereq>
       <packagereq type="mandatory">texlive-etex-pkg</packagereq>
+      <packagereq type="mandatory">texlive-etexcmds</packagereq>
+      <packagereq type="mandatory">texlive-etoc</packagereq>
       <packagereq type="mandatory">texlive-etoolbox</packagereq>
       <packagereq type="mandatory">texlive-euenc</packagereq>
       <packagereq type="mandatory">texlive-euler</packagereq>
       <packagereq type="mandatory">texlive-euro</packagereq>
       <packagereq type="mandatory">texlive-eurosym</packagereq>
+      <packagereq type="mandatory">texlive-everysel</packagereq>
+      <packagereq type="mandatory">texlive-everyshi</packagereq>
       <packagereq type="mandatory">texlive-extsizes</packagereq>
       <packagereq type="mandatory">texlive-fancybox</packagereq>
       <packagereq type="mandatory">texlive-fancyhdr</packagereq>
@@ -1140,29 +1176,40 @@
       <packagereq type="mandatory">texlive-fontware</packagereq>
       <packagereq type="mandatory">texlive-fontwrap</packagereq>
       <packagereq type="mandatory">texlive-footmisc</packagereq>
+      <packagereq type="mandatory">texlive-footnotehyper</packagereq>
       <packagereq type="mandatory">texlive-fp</packagereq>
       <packagereq type="mandatory">texlive-fpl</packagereq>
       <packagereq type="mandatory">texlive-framed</packagereq>
       <packagereq type="mandatory">texlive-garuda-c90</packagereq>
       <packagereq type="mandatory">texlive-geometry</packagereq>
+      <packagereq type="mandatory">texlive-gettitlestring</packagereq>
       <packagereq type="mandatory">texlive-glyphlist</packagereq>
       <packagereq type="mandatory">texlive-graphics</packagereq>
       <packagereq type="mandatory">texlive-graphics-cfg</packagereq>
       <packagereq type="mandatory">texlive-graphics-def</packagereq>
+      <packagereq type="mandatory">texlive-grfext</packagereq>
+      <packagereq type="mandatory">texlive-grffile</packagereq>
       <packagereq type="mandatory">texlive-gsftopk</packagereq>
+      <packagereq type="mandatory">texlive-hanging</packagereq>
       <packagereq type="mandatory">texlive-helvetic</packagereq>
+      <packagereq type="mandatory">texlive-hobsub</packagereq>
+      <packagereq type="mandatory">texlive-hologo</packagereq>
+      <packagereq type="mandatory">texlive-hopatch</packagereq>
+      <packagereq type="mandatory">texlive-hycolor</packagereq>
+      <packagereq type="mandatory">texlive-hypdoc</packagereq>
       <packagereq type="mandatory">texlive-hyperref</packagereq>
       <packagereq type="mandatory">texlive-hyph-utf8</packagereq>
       <packagereq type="mandatory">texlive-hyphen-base</packagereq>
       <packagereq type="mandatory">texlive-hyphenat</packagereq>
-      <packagereq type="mandatory">texlive-ifetex</packagereq>
-      <packagereq type="mandatory">texlive-ifluatex</packagereq>
+      <packagereq type="mandatory">texlive-hyphenex</packagereq>
       <packagereq type="mandatory">texlive-ifmtarg</packagereq>
       <packagereq type="mandatory">texlive-ifoddpage</packagereq>
+      <packagereq type="mandatory">texlive-ifplatform</packagereq>
       <packagereq type="mandatory">texlive-iftex</packagereq>
-      <packagereq type="mandatory">texlive-ifxetex</packagereq>
       <packagereq type="mandatory">texlive-import</packagereq>
       <packagereq type="mandatory">texlive-index</packagereq>
+      <packagereq type="mandatory">texlive-infwarerr</packagereq>
+      <packagereq type="mandatory">texlive-intcalc</packagereq>
       <packagereq type="mandatory">texlive-jadetex</packagereq>
       <packagereq type="mandatory">texlive-jknapltx</packagereq>
       <packagereq type="mandatory">texlive-kastrup</packagereq>
@@ -1171,6 +1218,10 @@
       <packagereq type="mandatory">texlive-knuth-local</packagereq>
       <packagereq type="mandatory">texlive-koma-script</packagereq>
       <packagereq type="mandatory">texlive-kpathsea</packagereq>
+      <packagereq type="mandatory">texlive-kvdefinekeys</packagereq>
+      <packagereq type="mandatory">texlive-kvoptions</packagereq>
+      <packagereq type="mandatory">texlive-kvsetkeys</packagereq>
+      <packagereq type="mandatory">texlive-l3backend</packagereq>
       <packagereq type="mandatory">texlive-l3experimental</packagereq>
       <packagereq type="mandatory">texlive-l3kernel</packagereq>
       <packagereq type="mandatory">texlive-l3packages</packagereq>
@@ -1178,23 +1229,30 @@
       <packagereq type="mandatory">texlive-latex</packagereq>
       <packagereq type="mandatory">texlive-latex-fonts</packagereq>
       <packagereq type="mandatory">texlive-latex2man</packagereq>
+      <packagereq type="mandatory">texlive-latexbug</packagereq>
       <packagereq type="mandatory">texlive-latexconfig</packagereq>
+      <packagereq type="mandatory">texlive-letltxmacro</packagereq>
       <packagereq type="mandatory">texlive-lettrine</packagereq>
       <packagereq type="mandatory">texlive-lib</packagereq>
       <packagereq type="mandatory">texlive-linegoal</packagereq>
       <packagereq type="mandatory">texlive-lineno</packagereq>
       <packagereq type="mandatory">texlive-listings</packagereq>
+      <packagereq type="mandatory">texlive-listofitems</packagereq>
       <packagereq type="mandatory">texlive-lm</packagereq>
       <packagereq type="mandatory">texlive-lm-math</packagereq>
       <packagereq type="mandatory">texlive-ltabptch</packagereq>
+      <packagereq type="mandatory">texlive-ltxcmds</packagereq>
       <packagereq type="mandatory">texlive-ltxmisc</packagereq>
       <packagereq type="mandatory">texlive-lua-alt-getopt</packagereq>
+      <packagereq type="mandatory">texlive-lua-uni-algos</packagereq>
+      <packagereq type="mandatory">texlive-luahbtex</packagereq>
       <packagereq type="mandatory">texlive-lualatex-math</packagereq>
       <packagereq type="mandatory">texlive-lualibs</packagereq>
       <packagereq type="mandatory">texlive-luaotfload</packagereq>
       <packagereq type="mandatory">texlive-luatex</packagereq>
       <packagereq type="mandatory">texlive-luatex85</packagereq>
       <packagereq type="mandatory">texlive-luatexbase</packagereq>
+      <packagereq type="mandatory">texlive-lwarp</packagereq>
       <packagereq type="mandatory">texlive-makecmds</packagereq>
       <packagereq type="mandatory">texlive-makeindex</packagereq>
       <packagereq type="mandatory">texlive-manfnt-font</packagereq>
@@ -1213,17 +1271,22 @@
       <packagereq type="mandatory">texlive-mfnfss</packagereq>
       <packagereq type="mandatory">texlive-mfware</packagereq>
       <packagereq type="mandatory">texlive-microtype</packagereq>
+      <packagereq type="mandatory">texlive-minitoc</packagereq>
       <packagereq type="mandatory">texlive-mnsymbol</packagereq>
+      <packagereq type="mandatory">texlive-modes</packagereq>
       <packagereq type="mandatory">texlive-mparhack</packagereq>
       <packagereq type="mandatory">texlive-mptopdf</packagereq>
-      <packagereq type="mandatory">texlive-ms</packagereq>
       <packagereq type="mandatory">texlive-multido</packagereq>
       <packagereq type="mandatory">texlive-multirow</packagereq>
+      <packagereq type="mandatory">texlive-multitoc</packagereq>
       <packagereq type="mandatory">texlive-natbib</packagereq>
       <packagereq type="mandatory">texlive-ncctools</packagereq>
       <packagereq type="mandatory">texlive-ncntrsbk</packagereq>
       <packagereq type="mandatory">texlive-needspace</packagereq>
+      <packagereq type="mandatory">texlive-newfloat</packagereq>
+      <packagereq type="mandatory">texlive-newunicodechar</packagereq>
       <packagereq type="mandatory">texlive-norasi-c90</packagereq>
+      <packagereq type="mandatory">texlive-notoccite</packagereq>
       <packagereq type="mandatory">texlive-ntgclass</packagereq>
       <packagereq type="mandatory">texlive-oberdiek</packagereq>
       <packagereq type="mandatory">texlive-overpic</packagereq>
@@ -1232,11 +1295,19 @@
       <packagereq type="mandatory">texlive-parallel</packagereq>
       <packagereq type="mandatory">texlive-parskip</packagereq>
       <packagereq type="mandatory">texlive-passivetex</packagereq>
+      <packagereq type="mandatory">texlive-pdfcol</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolfoot</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolmk</packagereq>
+      <packagereq type="mandatory">texlive-pdfescape</packagereq>
+      <packagereq type="mandatory">texlive-pdflscape</packagereq>
+      <packagereq type="mandatory">texlive-pdfmanagement-testphase</packagereq>
       <packagereq type="mandatory">texlive-pdfpages</packagereq>
       <packagereq type="mandatory">texlive-pdftex</packagereq>
+      <packagereq type="mandatory">texlive-pdftexcmds</packagereq>
       <packagereq type="mandatory">texlive-pgf</packagereq>
       <packagereq type="mandatory">texlive-philokalia</packagereq>
       <packagereq type="mandatory">texlive-placeins</packagereq>
+      <packagereq type="mandatory">texlive-plain</packagereq>
       <packagereq type="mandatory">texlive-polyglossia</packagereq>
       <packagereq type="mandatory">texlive-powerdot</packagereq>
       <packagereq type="mandatory">texlive-preprint</packagereq>
@@ -1245,6 +1316,7 @@
       <packagereq type="mandatory">texlive-psnfss</packagereq>
       <packagereq type="mandatory">texlive-pspicture</packagereq>
       <packagereq type="mandatory">texlive-pst-3d</packagereq>
+      <packagereq type="mandatory">texlive-pst-arrow</packagereq>
       <packagereq type="mandatory">texlive-pst-blur</packagereq>
       <packagereq type="mandatory">texlive-pst-coil</packagereq>
       <packagereq type="mandatory">texlive-pst-eps</packagereq>
@@ -1255,16 +1327,22 @@
       <packagereq type="mandatory">texlive-pst-plot</packagereq>
       <packagereq type="mandatory">texlive-pst-slpe</packagereq>
       <packagereq type="mandatory">texlive-pst-text</packagereq>
+      <packagereq type="mandatory">texlive-pst-tools</packagereq>
       <packagereq type="mandatory">texlive-pst-tree</packagereq>
       <packagereq type="mandatory">texlive-pstricks</packagereq>
       <packagereq type="mandatory">texlive-pstricks-add</packagereq>
       <packagereq type="mandatory">texlive-ptext</packagereq>
       <packagereq type="mandatory">texlive-pxfonts</packagereq>
       <packagereq type="mandatory">texlive-qstest</packagereq>
+      <packagereq type="mandatory">texlive-ragged2e</packagereq>
       <packagereq type="mandatory">texlive-rcs</packagereq>
       <packagereq type="mandatory">texlive-realscripts</packagereq>
+      <packagereq type="mandatory">texlive-refcount</packagereq>
+      <packagereq type="mandatory">texlive-relsize</packagereq>
+      <packagereq type="mandatory">texlive-rerunfilecheck</packagereq>
       <packagereq type="mandatory">texlive-rsfs</packagereq>
       <packagereq type="mandatory">texlive-sansmath</packagereq>
+      <packagereq type="mandatory">texlive-sansmathaccent</packagereq>
       <packagereq type="mandatory">texlive-sauerj</packagereq>
       <packagereq type="mandatory">texlive-scheme-basic</packagereq>
       <packagereq type="mandatory">texlive-section</packagereq>
@@ -1272,9 +1350,12 @@
       <packagereq type="mandatory">texlive-seminar</packagereq>
       <packagereq type="mandatory">texlive-sepnum</packagereq>
       <packagereq type="mandatory">texlive-setspace</packagereq>
+      <packagereq type="mandatory">texlive-sfmath</packagereq>
       <packagereq type="mandatory">texlive-showexpl</packagereq>
       <packagereq type="mandatory">texlive-soul</packagereq>
+      <packagereq type="mandatory">texlive-stackengine</packagereq>
       <packagereq type="mandatory">texlive-stmaryrd</packagereq>
+      <packagereq type="mandatory">texlive-stringenc</packagereq>
       <packagereq type="mandatory">texlive-subfig</packagereq>
       <packagereq type="mandatory">texlive-subfigure</packagereq>
       <packagereq type="mandatory">texlive-svn-prov</packagereq>
@@ -1282,7 +1363,6 @@
       <packagereq type="mandatory">texlive-t2</packagereq>
       <packagereq type="mandatory">texlive-tabu</packagereq>
       <packagereq type="mandatory">texlive-tabulary</packagereq>
-      <packagereq type="mandatory">texlive-tetex</packagereq>
       <packagereq type="mandatory">texlive-tex</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre-math</packagereq>
@@ -1292,6 +1372,7 @@
       <packagereq type="mandatory">texlive-texlive-en</packagereq>
       <packagereq type="mandatory">texlive-texlive-msg-translations</packagereq>
       <packagereq type="mandatory">texlive-texlive-scripts</packagereq>
+      <packagereq type="mandatory">texlive-texlive-scripts-extra</packagereq>
       <packagereq type="mandatory">texlive-texlive.infra</packagereq>
       <packagereq type="mandatory">texlive-textcase</packagereq>
       <packagereq type="mandatory">texlive-textpos</packagereq>
@@ -1303,10 +1384,12 @@
       <packagereq type="mandatory">texlive-titling</packagereq>
       <packagereq type="mandatory">texlive-tocloft</packagereq>
       <packagereq type="mandatory">texlive-tools</packagereq>
+      <packagereq type="mandatory">texlive-translator</packagereq>
       <packagereq type="mandatory">texlive-trimspaces</packagereq>
       <packagereq type="mandatory">texlive-txfonts</packagereq>
       <packagereq type="mandatory">texlive-type1cm</packagereq>
       <packagereq type="mandatory">texlive-typehtml</packagereq>
+      <packagereq type="mandatory">texlive-ucharcat</packagereq>
       <packagereq type="mandatory">texlive-ucharclasses</packagereq>
       <packagereq type="mandatory">texlive-ucs</packagereq>
       <packagereq type="mandatory">texlive-uhc</packagereq>
@@ -1314,6 +1397,7 @@
       <packagereq type="mandatory">texlive-underscore</packagereq>
       <packagereq type="mandatory">texlive-unicode-data</packagereq>
       <packagereq type="mandatory">texlive-unicode-math</packagereq>
+      <packagereq type="mandatory">texlive-uniquecounter</packagereq>
       <packagereq type="mandatory">texlive-unisugar</packagereq>
       <packagereq type="mandatory">texlive-upquote</packagereq>
       <packagereq type="mandatory">texlive-url</packagereq>
@@ -1322,6 +1406,7 @@
       <packagereq type="mandatory">texlive-wadalab</packagereq>
       <packagereq type="mandatory">texlive-was</packagereq>
       <packagereq type="mandatory">texlive-wasy</packagereq>
+      <packagereq type="mandatory">texlive-wasy-type1</packagereq>
       <packagereq type="mandatory">texlive-wasysym</packagereq>
       <packagereq type="mandatory">texlive-wrapfig</packagereq>
       <packagereq type="mandatory">texlive-xcolor</packagereq>
@@ -1336,16 +1421,18 @@
       <packagereq type="mandatory">texlive-xetex-pstricks</packagereq>
       <packagereq type="mandatory">texlive-xetexconfig</packagereq>
       <packagereq type="mandatory">texlive-xetexfontinfo</packagereq>
+      <packagereq type="mandatory">texlive-xfrac</packagereq>
       <packagereq type="mandatory">texlive-xifthen</packagereq>
       <packagereq type="mandatory">texlive-xkeyval</packagereq>
       <packagereq type="mandatory">texlive-xltxtra</packagereq>
       <packagereq type="mandatory">texlive-xmltex</packagereq>
-      <packagereq type="mandatory">texlive-xmltexconfig</packagereq>
+      <packagereq type="mandatory">texlive-xpatch</packagereq>
       <packagereq type="mandatory">texlive-xstring</packagereq>
       <packagereq type="mandatory">texlive-xtab</packagereq>
       <packagereq type="mandatory">texlive-xunicode</packagereq>
       <packagereq type="mandatory">texlive-zapfchan</packagereq>
       <packagereq type="mandatory">texlive-zapfding</packagereq>
+      <packagereq type="mandatory">texlive-zref</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1478,6 +1565,7 @@
       <groupid>debugging</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid>infiniband</groupid>
+      <groupid>java-platform</groupid>
       <groupid>network-tools</groupid>
       <groupid>performance</groupid>
       <groupid>print-client</groupid>
diff --git a/comps/AppStream-ppc64le.xml b/comps/AppStream-ppc64le.xml
index 1deec29..8cf98ec 100644
--- a/comps/AppStream-ppc64le.xml
+++ b/comps/AppStream-ppc64le.xml
@@ -371,20 +371,10 @@
       <packagereq type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>gnome-apps</id>
-    <name>GNOME Applications</name>
-    <description>A set of commonly used GNOME Applications.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">brasero</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -585,11 +575,28 @@
       <packagereq type="default">ant-swing</packagereq>
       <packagereq type="default">ant-testutil</packagereq>
       <packagereq type="default">ant-xz</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-devel</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">log4j</packagereq>
       <packagereq type="default">log4j-jcl</packagereq>
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>java-platform</id>
+    <name>Java Platform</name>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">java-21-openjdk</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <name>Mail Server</name>
@@ -915,7 +922,7 @@
   <group>
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
-    <description/>
+    <description>Remote desktop app supporting RDP</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1058,9 +1065,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">texlive</packagereq>
+      <packagereq type="mandatory">texlive-acronym</packagereq>
       <packagereq type="mandatory">texlive-adjustbox</packagereq>
       <packagereq type="mandatory">texlive-ae</packagereq>
       <packagereq type="mandatory">texlive-algorithms</packagereq>
+      <packagereq type="mandatory">texlive-alphalph</packagereq>
       <packagereq type="mandatory">texlive-amscls</packagereq>
       <packagereq type="mandatory">texlive-amsfonts</packagereq>
       <packagereq type="mandatory">texlive-amsmath</packagereq>
@@ -1068,7 +1077,11 @@
       <packagereq type="mandatory">texlive-anysize</packagereq>
       <packagereq type="mandatory">texlive-appendix</packagereq>
       <packagereq type="mandatory">texlive-arphic</packagereq>
+      <packagereq type="mandatory">texlive-atbegshi</packagereq>
       <packagereq type="mandatory">texlive-attachfile</packagereq>
+      <packagereq type="mandatory">texlive-attachfile2</packagereq>
+      <packagereq type="mandatory">texlive-atveryend</packagereq>
+      <packagereq type="mandatory">texlive-auxhook</packagereq>
       <packagereq type="mandatory">texlive-avantgar</packagereq>
       <packagereq type="mandatory">texlive-awesomebox</packagereq>
       <packagereq type="mandatory">texlive-babel</packagereq>
@@ -1082,13 +1095,17 @@
       <packagereq type="mandatory">texlive-bibtopic</packagereq>
       <packagereq type="mandatory">texlive-bidi</packagereq>
       <packagereq type="mandatory">texlive-bigfoot</packagereq>
+      <packagereq type="mandatory">texlive-bigintcalc</packagereq>
+      <packagereq type="mandatory">texlive-bitset</packagereq>
       <packagereq type="mandatory">texlive-bookman</packagereq>
+      <packagereq type="mandatory">texlive-bookmark</packagereq>
       <packagereq type="mandatory">texlive-booktabs</packagereq>
       <packagereq type="mandatory">texlive-breakurl</packagereq>
       <packagereq type="mandatory">texlive-breqn</packagereq>
       <packagereq type="mandatory">texlive-capt-of</packagereq>
       <packagereq type="mandatory">texlive-caption</packagereq>
       <packagereq type="mandatory">texlive-carlisle</packagereq>
+      <packagereq type="mandatory">texlive-catchfile</packagereq>
       <packagereq type="mandatory">texlive-changebar</packagereq>
       <packagereq type="mandatory">texlive-changepage</packagereq>
       <packagereq type="mandatory">texlive-charter</packagereq>
@@ -1108,7 +1125,10 @@
       <packagereq type="mandatory">texlive-collection-latex</packagereq>
       <packagereq type="mandatory">texlive-collection-latexrecommended</packagereq>
       <packagereq type="mandatory">texlive-collection-xetex</packagereq>
+      <packagereq type="mandatory">texlive-colorprofiles</packagereq>
       <packagereq type="mandatory">texlive-colortbl</packagereq>
+      <packagereq type="mandatory">texlive-context</packagereq>
+      <packagereq type="mandatory">texlive-count1to</packagereq>
       <packagereq type="mandatory">texlive-courier</packagereq>
       <packagereq type="mandatory">texlive-crop</packagereq>
       <packagereq type="mandatory">texlive-csquotes</packagereq>
@@ -1116,6 +1136,7 @@
       <packagereq type="mandatory">texlive-ctablestack</packagereq>
       <packagereq type="mandatory">texlive-currfile</packagereq>
       <packagereq type="mandatory">texlive-datetime</packagereq>
+      <packagereq type="mandatory">texlive-dehyph</packagereq>
       <packagereq type="mandatory">texlive-dvipdfmx</packagereq>
       <packagereq type="mandatory">texlive-dvipng</packagereq>
       <packagereq type="mandatory">texlive-dvips</packagereq>
@@ -1127,15 +1148,20 @@
       <packagereq type="mandatory">texlive-environ</packagereq>
       <packagereq type="mandatory">texlive-epsf</packagereq>
       <packagereq type="mandatory">texlive-epstopdf</packagereq>
+      <packagereq type="mandatory">texlive-epstopdf-pkg</packagereq>
       <packagereq type="mandatory">texlive-eqparbox</packagereq>
       <packagereq type="mandatory">texlive-eso-pic</packagereq>
       <packagereq type="mandatory">texlive-etex</packagereq>
       <packagereq type="mandatory">texlive-etex-pkg</packagereq>
+      <packagereq type="mandatory">texlive-etexcmds</packagereq>
+      <packagereq type="mandatory">texlive-etoc</packagereq>
       <packagereq type="mandatory">texlive-etoolbox</packagereq>
       <packagereq type="mandatory">texlive-euenc</packagereq>
       <packagereq type="mandatory">texlive-euler</packagereq>
       <packagereq type="mandatory">texlive-euro</packagereq>
       <packagereq type="mandatory">texlive-eurosym</packagereq>
+      <packagereq type="mandatory">texlive-everysel</packagereq>
+      <packagereq type="mandatory">texlive-everyshi</packagereq>
       <packagereq type="mandatory">texlive-extsizes</packagereq>
       <packagereq type="mandatory">texlive-fancybox</packagereq>
       <packagereq type="mandatory">texlive-fancyhdr</packagereq>
@@ -1156,29 +1182,40 @@
       <packagereq type="mandatory">texlive-fontware</packagereq>
       <packagereq type="mandatory">texlive-fontwrap</packagereq>
       <packagereq type="mandatory">texlive-footmisc</packagereq>
+      <packagereq type="mandatory">texlive-footnotehyper</packagereq>
       <packagereq type="mandatory">texlive-fp</packagereq>
       <packagereq type="mandatory">texlive-fpl</packagereq>
       <packagereq type="mandatory">texlive-framed</packagereq>
       <packagereq type="mandatory">texlive-garuda-c90</packagereq>
       <packagereq type="mandatory">texlive-geometry</packagereq>
+      <packagereq type="mandatory">texlive-gettitlestring</packagereq>
       <packagereq type="mandatory">texlive-glyphlist</packagereq>
       <packagereq type="mandatory">texlive-graphics</packagereq>
       <packagereq type="mandatory">texlive-graphics-cfg</packagereq>
       <packagereq type="mandatory">texlive-graphics-def</packagereq>
+      <packagereq type="mandatory">texlive-grfext</packagereq>
+      <packagereq type="mandatory">texlive-grffile</packagereq>
       <packagereq type="mandatory">texlive-gsftopk</packagereq>
+      <packagereq type="mandatory">texlive-hanging</packagereq>
       <packagereq type="mandatory">texlive-helvetic</packagereq>
+      <packagereq type="mandatory">texlive-hobsub</packagereq>
+      <packagereq type="mandatory">texlive-hologo</packagereq>
+      <packagereq type="mandatory">texlive-hopatch</packagereq>
+      <packagereq type="mandatory">texlive-hycolor</packagereq>
+      <packagereq type="mandatory">texlive-hypdoc</packagereq>
       <packagereq type="mandatory">texlive-hyperref</packagereq>
       <packagereq type="mandatory">texlive-hyph-utf8</packagereq>
       <packagereq type="mandatory">texlive-hyphen-base</packagereq>
       <packagereq type="mandatory">texlive-hyphenat</packagereq>
-      <packagereq type="mandatory">texlive-ifetex</packagereq>
-      <packagereq type="mandatory">texlive-ifluatex</packagereq>
+      <packagereq type="mandatory">texlive-hyphenex</packagereq>
       <packagereq type="mandatory">texlive-ifmtarg</packagereq>
       <packagereq type="mandatory">texlive-ifoddpage</packagereq>
+      <packagereq type="mandatory">texlive-ifplatform</packagereq>
       <packagereq type="mandatory">texlive-iftex</packagereq>
-      <packagereq type="mandatory">texlive-ifxetex</packagereq>
       <packagereq type="mandatory">texlive-import</packagereq>
       <packagereq type="mandatory">texlive-index</packagereq>
+      <packagereq type="mandatory">texlive-infwarerr</packagereq>
+      <packagereq type="mandatory">texlive-intcalc</packagereq>
       <packagereq type="mandatory">texlive-jadetex</packagereq>
       <packagereq type="mandatory">texlive-jknapltx</packagereq>
       <packagereq type="mandatory">texlive-kastrup</packagereq>
@@ -1187,6 +1224,10 @@
       <packagereq type="mandatory">texlive-knuth-local</packagereq>
       <packagereq type="mandatory">texlive-koma-script</packagereq>
       <packagereq type="mandatory">texlive-kpathsea</packagereq>
+      <packagereq type="mandatory">texlive-kvdefinekeys</packagereq>
+      <packagereq type="mandatory">texlive-kvoptions</packagereq>
+      <packagereq type="mandatory">texlive-kvsetkeys</packagereq>
+      <packagereq type="mandatory">texlive-l3backend</packagereq>
       <packagereq type="mandatory">texlive-l3experimental</packagereq>
       <packagereq type="mandatory">texlive-l3kernel</packagereq>
       <packagereq type="mandatory">texlive-l3packages</packagereq>
@@ -1194,23 +1235,30 @@
       <packagereq type="mandatory">texlive-latex</packagereq>
       <packagereq type="mandatory">texlive-latex-fonts</packagereq>
       <packagereq type="mandatory">texlive-latex2man</packagereq>
+      <packagereq type="mandatory">texlive-latexbug</packagereq>
       <packagereq type="mandatory">texlive-latexconfig</packagereq>
+      <packagereq type="mandatory">texlive-letltxmacro</packagereq>
       <packagereq type="mandatory">texlive-lettrine</packagereq>
       <packagereq type="mandatory">texlive-lib</packagereq>
       <packagereq type="mandatory">texlive-linegoal</packagereq>
       <packagereq type="mandatory">texlive-lineno</packagereq>
       <packagereq type="mandatory">texlive-listings</packagereq>
+      <packagereq type="mandatory">texlive-listofitems</packagereq>
       <packagereq type="mandatory">texlive-lm</packagereq>
       <packagereq type="mandatory">texlive-lm-math</packagereq>
       <packagereq type="mandatory">texlive-ltabptch</packagereq>
+      <packagereq type="mandatory">texlive-ltxcmds</packagereq>
       <packagereq type="mandatory">texlive-ltxmisc</packagereq>
       <packagereq type="mandatory">texlive-lua-alt-getopt</packagereq>
+      <packagereq type="mandatory">texlive-lua-uni-algos</packagereq>
+      <packagereq type="mandatory">texlive-luahbtex</packagereq>
       <packagereq type="mandatory">texlive-lualatex-math</packagereq>
       <packagereq type="mandatory">texlive-lualibs</packagereq>
       <packagereq type="mandatory">texlive-luaotfload</packagereq>
       <packagereq type="mandatory">texlive-luatex</packagereq>
       <packagereq type="mandatory">texlive-luatex85</packagereq>
       <packagereq type="mandatory">texlive-luatexbase</packagereq>
+      <packagereq type="mandatory">texlive-lwarp</packagereq>
       <packagereq type="mandatory">texlive-makecmds</packagereq>
       <packagereq type="mandatory">texlive-makeindex</packagereq>
       <packagereq type="mandatory">texlive-manfnt-font</packagereq>
@@ -1229,17 +1277,22 @@
       <packagereq type="mandatory">texlive-mfnfss</packagereq>
       <packagereq type="mandatory">texlive-mfware</packagereq>
       <packagereq type="mandatory">texlive-microtype</packagereq>
+      <packagereq type="mandatory">texlive-minitoc</packagereq>
       <packagereq type="mandatory">texlive-mnsymbol</packagereq>
+      <packagereq type="mandatory">texlive-modes</packagereq>
       <packagereq type="mandatory">texlive-mparhack</packagereq>
       <packagereq type="mandatory">texlive-mptopdf</packagereq>
-      <packagereq type="mandatory">texlive-ms</packagereq>
       <packagereq type="mandatory">texlive-multido</packagereq>
       <packagereq type="mandatory">texlive-multirow</packagereq>
+      <packagereq type="mandatory">texlive-multitoc</packagereq>
       <packagereq type="mandatory">texlive-natbib</packagereq>
       <packagereq type="mandatory">texlive-ncctools</packagereq>
       <packagereq type="mandatory">texlive-ncntrsbk</packagereq>
       <packagereq type="mandatory">texlive-needspace</packagereq>
+      <packagereq type="mandatory">texlive-newfloat</packagereq>
+      <packagereq type="mandatory">texlive-newunicodechar</packagereq>
       <packagereq type="mandatory">texlive-norasi-c90</packagereq>
+      <packagereq type="mandatory">texlive-notoccite</packagereq>
       <packagereq type="mandatory">texlive-ntgclass</packagereq>
       <packagereq type="mandatory">texlive-oberdiek</packagereq>
       <packagereq type="mandatory">texlive-overpic</packagereq>
@@ -1248,11 +1301,19 @@
       <packagereq type="mandatory">texlive-parallel</packagereq>
       <packagereq type="mandatory">texlive-parskip</packagereq>
       <packagereq type="mandatory">texlive-passivetex</packagereq>
+      <packagereq type="mandatory">texlive-pdfcol</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolfoot</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolmk</packagereq>
+      <packagereq type="mandatory">texlive-pdfescape</packagereq>
+      <packagereq type="mandatory">texlive-pdflscape</packagereq>
+      <packagereq type="mandatory">texlive-pdfmanagement-testphase</packagereq>
       <packagereq type="mandatory">texlive-pdfpages</packagereq>
       <packagereq type="mandatory">texlive-pdftex</packagereq>
+      <packagereq type="mandatory">texlive-pdftexcmds</packagereq>
       <packagereq type="mandatory">texlive-pgf</packagereq>
       <packagereq type="mandatory">texlive-philokalia</packagereq>
       <packagereq type="mandatory">texlive-placeins</packagereq>
+      <packagereq type="mandatory">texlive-plain</packagereq>
       <packagereq type="mandatory">texlive-polyglossia</packagereq>
       <packagereq type="mandatory">texlive-powerdot</packagereq>
       <packagereq type="mandatory">texlive-preprint</packagereq>
@@ -1261,6 +1322,7 @@
       <packagereq type="mandatory">texlive-psnfss</packagereq>
       <packagereq type="mandatory">texlive-pspicture</packagereq>
       <packagereq type="mandatory">texlive-pst-3d</packagereq>
+      <packagereq type="mandatory">texlive-pst-arrow</packagereq>
       <packagereq type="mandatory">texlive-pst-blur</packagereq>
       <packagereq type="mandatory">texlive-pst-coil</packagereq>
       <packagereq type="mandatory">texlive-pst-eps</packagereq>
@@ -1271,16 +1333,22 @@
       <packagereq type="mandatory">texlive-pst-plot</packagereq>
       <packagereq type="mandatory">texlive-pst-slpe</packagereq>
       <packagereq type="mandatory">texlive-pst-text</packagereq>
+      <packagereq type="mandatory">texlive-pst-tools</packagereq>
       <packagereq type="mandatory">texlive-pst-tree</packagereq>
       <packagereq type="mandatory">texlive-pstricks</packagereq>
       <packagereq type="mandatory">texlive-pstricks-add</packagereq>
       <packagereq type="mandatory">texlive-ptext</packagereq>
       <packagereq type="mandatory">texlive-pxfonts</packagereq>
       <packagereq type="mandatory">texlive-qstest</packagereq>
+      <packagereq type="mandatory">texlive-ragged2e</packagereq>
       <packagereq type="mandatory">texlive-rcs</packagereq>
       <packagereq type="mandatory">texlive-realscripts</packagereq>
+      <packagereq type="mandatory">texlive-refcount</packagereq>
+      <packagereq type="mandatory">texlive-relsize</packagereq>
+      <packagereq type="mandatory">texlive-rerunfilecheck</packagereq>
       <packagereq type="mandatory">texlive-rsfs</packagereq>
       <packagereq type="mandatory">texlive-sansmath</packagereq>
+      <packagereq type="mandatory">texlive-sansmathaccent</packagereq>
       <packagereq type="mandatory">texlive-sauerj</packagereq>
       <packagereq type="mandatory">texlive-scheme-basic</packagereq>
       <packagereq type="mandatory">texlive-section</packagereq>
@@ -1288,9 +1356,12 @@
       <packagereq type="mandatory">texlive-seminar</packagereq>
       <packagereq type="mandatory">texlive-sepnum</packagereq>
       <packagereq type="mandatory">texlive-setspace</packagereq>
+      <packagereq type="mandatory">texlive-sfmath</packagereq>
       <packagereq type="mandatory">texlive-showexpl</packagereq>
       <packagereq type="mandatory">texlive-soul</packagereq>
+      <packagereq type="mandatory">texlive-stackengine</packagereq>
       <packagereq type="mandatory">texlive-stmaryrd</packagereq>
+      <packagereq type="mandatory">texlive-stringenc</packagereq>
       <packagereq type="mandatory">texlive-subfig</packagereq>
       <packagereq type="mandatory">texlive-subfigure</packagereq>
       <packagereq type="mandatory">texlive-svn-prov</packagereq>
@@ -1298,7 +1369,6 @@
       <packagereq type="mandatory">texlive-t2</packagereq>
       <packagereq type="mandatory">texlive-tabu</packagereq>
       <packagereq type="mandatory">texlive-tabulary</packagereq>
-      <packagereq type="mandatory">texlive-tetex</packagereq>
       <packagereq type="mandatory">texlive-tex</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre-math</packagereq>
@@ -1308,6 +1378,7 @@
       <packagereq type="mandatory">texlive-texlive-en</packagereq>
       <packagereq type="mandatory">texlive-texlive-msg-translations</packagereq>
       <packagereq type="mandatory">texlive-texlive-scripts</packagereq>
+      <packagereq type="mandatory">texlive-texlive-scripts-extra</packagereq>
       <packagereq type="mandatory">texlive-texlive.infra</packagereq>
       <packagereq type="mandatory">texlive-textcase</packagereq>
       <packagereq type="mandatory">texlive-textpos</packagereq>
@@ -1319,10 +1390,12 @@
       <packagereq type="mandatory">texlive-titling</packagereq>
       <packagereq type="mandatory">texlive-tocloft</packagereq>
       <packagereq type="mandatory">texlive-tools</packagereq>
+      <packagereq type="mandatory">texlive-translator</packagereq>
       <packagereq type="mandatory">texlive-trimspaces</packagereq>
       <packagereq type="mandatory">texlive-txfonts</packagereq>
       <packagereq type="mandatory">texlive-type1cm</packagereq>
       <packagereq type="mandatory">texlive-typehtml</packagereq>
+      <packagereq type="mandatory">texlive-ucharcat</packagereq>
       <packagereq type="mandatory">texlive-ucharclasses</packagereq>
       <packagereq type="mandatory">texlive-ucs</packagereq>
       <packagereq type="mandatory">texlive-uhc</packagereq>
@@ -1330,6 +1403,7 @@
       <packagereq type="mandatory">texlive-underscore</packagereq>
       <packagereq type="mandatory">texlive-unicode-data</packagereq>
       <packagereq type="mandatory">texlive-unicode-math</packagereq>
+      <packagereq type="mandatory">texlive-uniquecounter</packagereq>
       <packagereq type="mandatory">texlive-unisugar</packagereq>
       <packagereq type="mandatory">texlive-upquote</packagereq>
       <packagereq type="mandatory">texlive-url</packagereq>
@@ -1338,6 +1412,7 @@
       <packagereq type="mandatory">texlive-wadalab</packagereq>
       <packagereq type="mandatory">texlive-was</packagereq>
       <packagereq type="mandatory">texlive-wasy</packagereq>
+      <packagereq type="mandatory">texlive-wasy-type1</packagereq>
       <packagereq type="mandatory">texlive-wasysym</packagereq>
       <packagereq type="mandatory">texlive-wrapfig</packagereq>
       <packagereq type="mandatory">texlive-xcolor</packagereq>
@@ -1352,16 +1427,18 @@
       <packagereq type="mandatory">texlive-xetex-pstricks</packagereq>
       <packagereq type="mandatory">texlive-xetexconfig</packagereq>
       <packagereq type="mandatory">texlive-xetexfontinfo</packagereq>
+      <packagereq type="mandatory">texlive-xfrac</packagereq>
       <packagereq type="mandatory">texlive-xifthen</packagereq>
       <packagereq type="mandatory">texlive-xkeyval</packagereq>
       <packagereq type="mandatory">texlive-xltxtra</packagereq>
       <packagereq type="mandatory">texlive-xmltex</packagereq>
-      <packagereq type="mandatory">texlive-xmltexconfig</packagereq>
+      <packagereq type="mandatory">texlive-xpatch</packagereq>
       <packagereq type="mandatory">texlive-xstring</packagereq>
       <packagereq type="mandatory">texlive-xtab</packagereq>
       <packagereq type="mandatory">texlive-xunicode</packagereq>
       <packagereq type="mandatory">texlive-zapfchan</packagereq>
       <packagereq type="mandatory">texlive-zapfding</packagereq>
+      <packagereq type="mandatory">texlive-zref</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1465,6 +1542,7 @@
       <groupid>debugging</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid>infiniband</groupid>
+      <groupid>java-platform</groupid>
       <groupid>network-tools</groupid>
       <groupid>performance</groupid>
       <groupid>print-client</groupid>
@@ -1493,7 +1571,6 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
     </grouplist>
   </category>
@@ -1586,7 +1663,6 @@
     </grouplist>
     <optionlist>
       <groupid>backup-client</groupid>
-      <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
diff --git a/comps/AppStream-s390x.xml b/comps/AppStream-s390x.xml
index 9d567d7..c0a8854 100644
--- a/comps/AppStream-s390x.xml
+++ b/comps/AppStream-s390x.xml
@@ -377,7 +377,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -535,11 +535,28 @@
       <packagereq type="default">ant-swing</packagereq>
       <packagereq type="default">ant-testutil</packagereq>
       <packagereq type="default">ant-xz</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-devel</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">log4j</packagereq>
       <packagereq type="default">log4j-jcl</packagereq>
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>java-platform</id>
+    <name>Java Platform</name>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">java-21-openjdk</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <name>Mail Server</name>
@@ -836,7 +853,7 @@
   <group>
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
-    <description/>
+    <description>Remote desktop app supporting RDP</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -982,9 +999,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">texlive</packagereq>
+      <packagereq type="mandatory">texlive-acronym</packagereq>
       <packagereq type="mandatory">texlive-adjustbox</packagereq>
       <packagereq type="mandatory">texlive-ae</packagereq>
       <packagereq type="mandatory">texlive-algorithms</packagereq>
+      <packagereq type="mandatory">texlive-alphalph</packagereq>
       <packagereq type="mandatory">texlive-amscls</packagereq>
       <packagereq type="mandatory">texlive-amsfonts</packagereq>
       <packagereq type="mandatory">texlive-amsmath</packagereq>
@@ -992,7 +1011,11 @@
       <packagereq type="mandatory">texlive-anysize</packagereq>
       <packagereq type="mandatory">texlive-appendix</packagereq>
       <packagereq type="mandatory">texlive-arphic</packagereq>
+      <packagereq type="mandatory">texlive-atbegshi</packagereq>
       <packagereq type="mandatory">texlive-attachfile</packagereq>
+      <packagereq type="mandatory">texlive-attachfile2</packagereq>
+      <packagereq type="mandatory">texlive-atveryend</packagereq>
+      <packagereq type="mandatory">texlive-auxhook</packagereq>
       <packagereq type="mandatory">texlive-avantgar</packagereq>
       <packagereq type="mandatory">texlive-awesomebox</packagereq>
       <packagereq type="mandatory">texlive-babel</packagereq>
@@ -1006,13 +1029,17 @@
       <packagereq type="mandatory">texlive-bibtopic</packagereq>
       <packagereq type="mandatory">texlive-bidi</packagereq>
       <packagereq type="mandatory">texlive-bigfoot</packagereq>
+      <packagereq type="mandatory">texlive-bigintcalc</packagereq>
+      <packagereq type="mandatory">texlive-bitset</packagereq>
       <packagereq type="mandatory">texlive-bookman</packagereq>
+      <packagereq type="mandatory">texlive-bookmark</packagereq>
       <packagereq type="mandatory">texlive-booktabs</packagereq>
       <packagereq type="mandatory">texlive-breakurl</packagereq>
       <packagereq type="mandatory">texlive-breqn</packagereq>
       <packagereq type="mandatory">texlive-capt-of</packagereq>
       <packagereq type="mandatory">texlive-caption</packagereq>
       <packagereq type="mandatory">texlive-carlisle</packagereq>
+      <packagereq type="mandatory">texlive-catchfile</packagereq>
       <packagereq type="mandatory">texlive-changebar</packagereq>
       <packagereq type="mandatory">texlive-changepage</packagereq>
       <packagereq type="mandatory">texlive-charter</packagereq>
@@ -1032,7 +1059,10 @@
       <packagereq type="mandatory">texlive-collection-latex</packagereq>
       <packagereq type="mandatory">texlive-collection-latexrecommended</packagereq>
       <packagereq type="mandatory">texlive-collection-xetex</packagereq>
+      <packagereq type="mandatory">texlive-colorprofiles</packagereq>
       <packagereq type="mandatory">texlive-colortbl</packagereq>
+      <packagereq type="mandatory">texlive-context</packagereq>
+      <packagereq type="mandatory">texlive-count1to</packagereq>
       <packagereq type="mandatory">texlive-courier</packagereq>
       <packagereq type="mandatory">texlive-crop</packagereq>
       <packagereq type="mandatory">texlive-csquotes</packagereq>
@@ -1040,6 +1070,7 @@
       <packagereq type="mandatory">texlive-ctablestack</packagereq>
       <packagereq type="mandatory">texlive-currfile</packagereq>
       <packagereq type="mandatory">texlive-datetime</packagereq>
+      <packagereq type="mandatory">texlive-dehyph</packagereq>
       <packagereq type="mandatory">texlive-dvipdfmx</packagereq>
       <packagereq type="mandatory">texlive-dvipng</packagereq>
       <packagereq type="mandatory">texlive-dvips</packagereq>
@@ -1051,15 +1082,20 @@
       <packagereq type="mandatory">texlive-environ</packagereq>
       <packagereq type="mandatory">texlive-epsf</packagereq>
       <packagereq type="mandatory">texlive-epstopdf</packagereq>
+      <packagereq type="mandatory">texlive-epstopdf-pkg</packagereq>
       <packagereq type="mandatory">texlive-eqparbox</packagereq>
       <packagereq type="mandatory">texlive-eso-pic</packagereq>
       <packagereq type="mandatory">texlive-etex</packagereq>
       <packagereq type="mandatory">texlive-etex-pkg</packagereq>
+      <packagereq type="mandatory">texlive-etexcmds</packagereq>
+      <packagereq type="mandatory">texlive-etoc</packagereq>
       <packagereq type="mandatory">texlive-etoolbox</packagereq>
       <packagereq type="mandatory">texlive-euenc</packagereq>
       <packagereq type="mandatory">texlive-euler</packagereq>
       <packagereq type="mandatory">texlive-euro</packagereq>
       <packagereq type="mandatory">texlive-eurosym</packagereq>
+      <packagereq type="mandatory">texlive-everysel</packagereq>
+      <packagereq type="mandatory">texlive-everyshi</packagereq>
       <packagereq type="mandatory">texlive-extsizes</packagereq>
       <packagereq type="mandatory">texlive-fancybox</packagereq>
       <packagereq type="mandatory">texlive-fancyhdr</packagereq>
@@ -1080,29 +1116,40 @@
       <packagereq type="mandatory">texlive-fontware</packagereq>
       <packagereq type="mandatory">texlive-fontwrap</packagereq>
       <packagereq type="mandatory">texlive-footmisc</packagereq>
+      <packagereq type="mandatory">texlive-footnotehyper</packagereq>
       <packagereq type="mandatory">texlive-fp</packagereq>
       <packagereq type="mandatory">texlive-fpl</packagereq>
       <packagereq type="mandatory">texlive-framed</packagereq>
       <packagereq type="mandatory">texlive-garuda-c90</packagereq>
       <packagereq type="mandatory">texlive-geometry</packagereq>
+      <packagereq type="mandatory">texlive-gettitlestring</packagereq>
       <packagereq type="mandatory">texlive-glyphlist</packagereq>
       <packagereq type="mandatory">texlive-graphics</packagereq>
       <packagereq type="mandatory">texlive-graphics-cfg</packagereq>
       <packagereq type="mandatory">texlive-graphics-def</packagereq>
+      <packagereq type="mandatory">texlive-grfext</packagereq>
+      <packagereq type="mandatory">texlive-grffile</packagereq>
       <packagereq type="mandatory">texlive-gsftopk</packagereq>
+      <packagereq type="mandatory">texlive-hanging</packagereq>
       <packagereq type="mandatory">texlive-helvetic</packagereq>
+      <packagereq type="mandatory">texlive-hobsub</packagereq>
+      <packagereq type="mandatory">texlive-hologo</packagereq>
+      <packagereq type="mandatory">texlive-hopatch</packagereq>
+      <packagereq type="mandatory">texlive-hycolor</packagereq>
+      <packagereq type="mandatory">texlive-hypdoc</packagereq>
       <packagereq type="mandatory">texlive-hyperref</packagereq>
       <packagereq type="mandatory">texlive-hyph-utf8</packagereq>
       <packagereq type="mandatory">texlive-hyphen-base</packagereq>
       <packagereq type="mandatory">texlive-hyphenat</packagereq>
-      <packagereq type="mandatory">texlive-ifetex</packagereq>
-      <packagereq type="mandatory">texlive-ifluatex</packagereq>
+      <packagereq type="mandatory">texlive-hyphenex</packagereq>
       <packagereq type="mandatory">texlive-ifmtarg</packagereq>
       <packagereq type="mandatory">texlive-ifoddpage</packagereq>
+      <packagereq type="mandatory">texlive-ifplatform</packagereq>
       <packagereq type="mandatory">texlive-iftex</packagereq>
-      <packagereq type="mandatory">texlive-ifxetex</packagereq>
       <packagereq type="mandatory">texlive-import</packagereq>
       <packagereq type="mandatory">texlive-index</packagereq>
+      <packagereq type="mandatory">texlive-infwarerr</packagereq>
+      <packagereq type="mandatory">texlive-intcalc</packagereq>
       <packagereq type="mandatory">texlive-jadetex</packagereq>
       <packagereq type="mandatory">texlive-jknapltx</packagereq>
       <packagereq type="mandatory">texlive-kastrup</packagereq>
@@ -1111,6 +1158,10 @@
       <packagereq type="mandatory">texlive-knuth-local</packagereq>
       <packagereq type="mandatory">texlive-koma-script</packagereq>
       <packagereq type="mandatory">texlive-kpathsea</packagereq>
+      <packagereq type="mandatory">texlive-kvdefinekeys</packagereq>
+      <packagereq type="mandatory">texlive-kvoptions</packagereq>
+      <packagereq type="mandatory">texlive-kvsetkeys</packagereq>
+      <packagereq type="mandatory">texlive-l3backend</packagereq>
       <packagereq type="mandatory">texlive-l3experimental</packagereq>
       <packagereq type="mandatory">texlive-l3kernel</packagereq>
       <packagereq type="mandatory">texlive-l3packages</packagereq>
@@ -1118,23 +1169,30 @@
       <packagereq type="mandatory">texlive-latex</packagereq>
       <packagereq type="mandatory">texlive-latex-fonts</packagereq>
       <packagereq type="mandatory">texlive-latex2man</packagereq>
+      <packagereq type="mandatory">texlive-latexbug</packagereq>
       <packagereq type="mandatory">texlive-latexconfig</packagereq>
+      <packagereq type="mandatory">texlive-letltxmacro</packagereq>
       <packagereq type="mandatory">texlive-lettrine</packagereq>
       <packagereq type="mandatory">texlive-lib</packagereq>
       <packagereq type="mandatory">texlive-linegoal</packagereq>
       <packagereq type="mandatory">texlive-lineno</packagereq>
       <packagereq type="mandatory">texlive-listings</packagereq>
+      <packagereq type="mandatory">texlive-listofitems</packagereq>
       <packagereq type="mandatory">texlive-lm</packagereq>
       <packagereq type="mandatory">texlive-lm-math</packagereq>
       <packagereq type="mandatory">texlive-ltabptch</packagereq>
+      <packagereq type="mandatory">texlive-ltxcmds</packagereq>
       <packagereq type="mandatory">texlive-ltxmisc</packagereq>
       <packagereq type="mandatory">texlive-lua-alt-getopt</packagereq>
+      <packagereq type="mandatory">texlive-lua-uni-algos</packagereq>
+      <packagereq type="mandatory">texlive-luahbtex</packagereq>
       <packagereq type="mandatory">texlive-lualatex-math</packagereq>
       <packagereq type="mandatory">texlive-lualibs</packagereq>
       <packagereq type="mandatory">texlive-luaotfload</packagereq>
       <packagereq type="mandatory">texlive-luatex</packagereq>
       <packagereq type="mandatory">texlive-luatex85</packagereq>
       <packagereq type="mandatory">texlive-luatexbase</packagereq>
+      <packagereq type="mandatory">texlive-lwarp</packagereq>
       <packagereq type="mandatory">texlive-makecmds</packagereq>
       <packagereq type="mandatory">texlive-makeindex</packagereq>
       <packagereq type="mandatory">texlive-manfnt-font</packagereq>
@@ -1153,17 +1211,22 @@
       <packagereq type="mandatory">texlive-mfnfss</packagereq>
       <packagereq type="mandatory">texlive-mfware</packagereq>
       <packagereq type="mandatory">texlive-microtype</packagereq>
+      <packagereq type="mandatory">texlive-minitoc</packagereq>
       <packagereq type="mandatory">texlive-mnsymbol</packagereq>
+      <packagereq type="mandatory">texlive-modes</packagereq>
       <packagereq type="mandatory">texlive-mparhack</packagereq>
       <packagereq type="mandatory">texlive-mptopdf</packagereq>
-      <packagereq type="mandatory">texlive-ms</packagereq>
       <packagereq type="mandatory">texlive-multido</packagereq>
       <packagereq type="mandatory">texlive-multirow</packagereq>
+      <packagereq type="mandatory">texlive-multitoc</packagereq>
       <packagereq type="mandatory">texlive-natbib</packagereq>
       <packagereq type="mandatory">texlive-ncctools</packagereq>
       <packagereq type="mandatory">texlive-ncntrsbk</packagereq>
       <packagereq type="mandatory">texlive-needspace</packagereq>
+      <packagereq type="mandatory">texlive-newfloat</packagereq>
+      <packagereq type="mandatory">texlive-newunicodechar</packagereq>
       <packagereq type="mandatory">texlive-norasi-c90</packagereq>
+      <packagereq type="mandatory">texlive-notoccite</packagereq>
       <packagereq type="mandatory">texlive-ntgclass</packagereq>
       <packagereq type="mandatory">texlive-oberdiek</packagereq>
       <packagereq type="mandatory">texlive-overpic</packagereq>
@@ -1172,11 +1235,19 @@
       <packagereq type="mandatory">texlive-parallel</packagereq>
       <packagereq type="mandatory">texlive-parskip</packagereq>
       <packagereq type="mandatory">texlive-passivetex</packagereq>
+      <packagereq type="mandatory">texlive-pdfcol</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolfoot</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolmk</packagereq>
+      <packagereq type="mandatory">texlive-pdfescape</packagereq>
+      <packagereq type="mandatory">texlive-pdflscape</packagereq>
+      <packagereq type="mandatory">texlive-pdfmanagement-testphase</packagereq>
       <packagereq type="mandatory">texlive-pdfpages</packagereq>
       <packagereq type="mandatory">texlive-pdftex</packagereq>
+      <packagereq type="mandatory">texlive-pdftexcmds</packagereq>
       <packagereq type="mandatory">texlive-pgf</packagereq>
       <packagereq type="mandatory">texlive-philokalia</packagereq>
       <packagereq type="mandatory">texlive-placeins</packagereq>
+      <packagereq type="mandatory">texlive-plain</packagereq>
       <packagereq type="mandatory">texlive-polyglossia</packagereq>
       <packagereq type="mandatory">texlive-powerdot</packagereq>
       <packagereq type="mandatory">texlive-preprint</packagereq>
@@ -1185,6 +1256,7 @@
       <packagereq type="mandatory">texlive-psnfss</packagereq>
       <packagereq type="mandatory">texlive-pspicture</packagereq>
       <packagereq type="mandatory">texlive-pst-3d</packagereq>
+      <packagereq type="mandatory">texlive-pst-arrow</packagereq>
       <packagereq type="mandatory">texlive-pst-blur</packagereq>
       <packagereq type="mandatory">texlive-pst-coil</packagereq>
       <packagereq type="mandatory">texlive-pst-eps</packagereq>
@@ -1195,16 +1267,22 @@
       <packagereq type="mandatory">texlive-pst-plot</packagereq>
       <packagereq type="mandatory">texlive-pst-slpe</packagereq>
       <packagereq type="mandatory">texlive-pst-text</packagereq>
+      <packagereq type="mandatory">texlive-pst-tools</packagereq>
       <packagereq type="mandatory">texlive-pst-tree</packagereq>
       <packagereq type="mandatory">texlive-pstricks</packagereq>
       <packagereq type="mandatory">texlive-pstricks-add</packagereq>
       <packagereq type="mandatory">texlive-ptext</packagereq>
       <packagereq type="mandatory">texlive-pxfonts</packagereq>
       <packagereq type="mandatory">texlive-qstest</packagereq>
+      <packagereq type="mandatory">texlive-ragged2e</packagereq>
       <packagereq type="mandatory">texlive-rcs</packagereq>
       <packagereq type="mandatory">texlive-realscripts</packagereq>
+      <packagereq type="mandatory">texlive-refcount</packagereq>
+      <packagereq type="mandatory">texlive-relsize</packagereq>
+      <packagereq type="mandatory">texlive-rerunfilecheck</packagereq>
       <packagereq type="mandatory">texlive-rsfs</packagereq>
       <packagereq type="mandatory">texlive-sansmath</packagereq>
+      <packagereq type="mandatory">texlive-sansmathaccent</packagereq>
       <packagereq type="mandatory">texlive-sauerj</packagereq>
       <packagereq type="mandatory">texlive-scheme-basic</packagereq>
       <packagereq type="mandatory">texlive-section</packagereq>
@@ -1212,9 +1290,12 @@
       <packagereq type="mandatory">texlive-seminar</packagereq>
       <packagereq type="mandatory">texlive-sepnum</packagereq>
       <packagereq type="mandatory">texlive-setspace</packagereq>
+      <packagereq type="mandatory">texlive-sfmath</packagereq>
       <packagereq type="mandatory">texlive-showexpl</packagereq>
       <packagereq type="mandatory">texlive-soul</packagereq>
+      <packagereq type="mandatory">texlive-stackengine</packagereq>
       <packagereq type="mandatory">texlive-stmaryrd</packagereq>
+      <packagereq type="mandatory">texlive-stringenc</packagereq>
       <packagereq type="mandatory">texlive-subfig</packagereq>
       <packagereq type="mandatory">texlive-subfigure</packagereq>
       <packagereq type="mandatory">texlive-svn-prov</packagereq>
@@ -1222,7 +1303,6 @@
       <packagereq type="mandatory">texlive-t2</packagereq>
       <packagereq type="mandatory">texlive-tabu</packagereq>
       <packagereq type="mandatory">texlive-tabulary</packagereq>
-      <packagereq type="mandatory">texlive-tetex</packagereq>
       <packagereq type="mandatory">texlive-tex</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre-math</packagereq>
@@ -1232,6 +1312,7 @@
       <packagereq type="mandatory">texlive-texlive-en</packagereq>
       <packagereq type="mandatory">texlive-texlive-msg-translations</packagereq>
       <packagereq type="mandatory">texlive-texlive-scripts</packagereq>
+      <packagereq type="mandatory">texlive-texlive-scripts-extra</packagereq>
       <packagereq type="mandatory">texlive-texlive.infra</packagereq>
       <packagereq type="mandatory">texlive-textcase</packagereq>
       <packagereq type="mandatory">texlive-textpos</packagereq>
@@ -1243,10 +1324,12 @@
       <packagereq type="mandatory">texlive-titling</packagereq>
       <packagereq type="mandatory">texlive-tocloft</packagereq>
       <packagereq type="mandatory">texlive-tools</packagereq>
+      <packagereq type="mandatory">texlive-translator</packagereq>
       <packagereq type="mandatory">texlive-trimspaces</packagereq>
       <packagereq type="mandatory">texlive-txfonts</packagereq>
       <packagereq type="mandatory">texlive-type1cm</packagereq>
       <packagereq type="mandatory">texlive-typehtml</packagereq>
+      <packagereq type="mandatory">texlive-ucharcat</packagereq>
       <packagereq type="mandatory">texlive-ucharclasses</packagereq>
       <packagereq type="mandatory">texlive-ucs</packagereq>
       <packagereq type="mandatory">texlive-uhc</packagereq>
@@ -1254,6 +1337,7 @@
       <packagereq type="mandatory">texlive-underscore</packagereq>
       <packagereq type="mandatory">texlive-unicode-data</packagereq>
       <packagereq type="mandatory">texlive-unicode-math</packagereq>
+      <packagereq type="mandatory">texlive-uniquecounter</packagereq>
       <packagereq type="mandatory">texlive-unisugar</packagereq>
       <packagereq type="mandatory">texlive-upquote</packagereq>
       <packagereq type="mandatory">texlive-url</packagereq>
@@ -1262,6 +1346,7 @@
       <packagereq type="mandatory">texlive-wadalab</packagereq>
       <packagereq type="mandatory">texlive-was</packagereq>
       <packagereq type="mandatory">texlive-wasy</packagereq>
+      <packagereq type="mandatory">texlive-wasy-type1</packagereq>
       <packagereq type="mandatory">texlive-wasysym</packagereq>
       <packagereq type="mandatory">texlive-wrapfig</packagereq>
       <packagereq type="mandatory">texlive-xcolor</packagereq>
@@ -1276,16 +1361,18 @@
       <packagereq type="mandatory">texlive-xetex-pstricks</packagereq>
       <packagereq type="mandatory">texlive-xetexconfig</packagereq>
       <packagereq type="mandatory">texlive-xetexfontinfo</packagereq>
+      <packagereq type="mandatory">texlive-xfrac</packagereq>
       <packagereq type="mandatory">texlive-xifthen</packagereq>
       <packagereq type="mandatory">texlive-xkeyval</packagereq>
       <packagereq type="mandatory">texlive-xltxtra</packagereq>
       <packagereq type="mandatory">texlive-xmltex</packagereq>
-      <packagereq type="mandatory">texlive-xmltexconfig</packagereq>
+      <packagereq type="mandatory">texlive-xpatch</packagereq>
       <packagereq type="mandatory">texlive-xstring</packagereq>
       <packagereq type="mandatory">texlive-xtab</packagereq>
       <packagereq type="mandatory">texlive-xunicode</packagereq>
       <packagereq type="mandatory">texlive-zapfchan</packagereq>
       <packagereq type="mandatory">texlive-zapfding</packagereq>
+      <packagereq type="mandatory">texlive-zref</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1418,6 +1505,7 @@
       <groupid>console-internet</groupid>
       <groupid>debugging</groupid>
       <groupid>hardware-monitoring</groupid>
+      <groupid>java-platform</groupid>
       <groupid>network-tools</groupid>
       <groupid>performance</groupid>
       <groupid>print-client</groupid>
diff --git a/comps/AppStream-x86_64.xml b/comps/AppStream-x86_64.xml
index c16baf9..4a6b9db 100644
--- a/comps/AppStream-x86_64.xml
+++ b/comps/AppStream-x86_64.xml
@@ -370,20 +370,10 @@
       <packagereq type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>gnome-apps</id>
-    <name>GNOME Applications</name>
-    <description>A set of commonly used GNOME Applications.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">brasero</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -588,11 +578,28 @@
       <packagereq type="default">ant-swing</packagereq>
       <packagereq type="default">ant-testutil</packagereq>
       <packagereq type="default">ant-xz</packagereq>
+      <packagereq type="default">java-21-openjdk-demo</packagereq>
+      <packagereq type="default">java-21-openjdk-devel</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">log4j</packagereq>
       <packagereq type="default">log4j-jcl</packagereq>
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>java-platform</id>
+    <name>Java Platform</name>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">java-21-openjdk</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <name>Mail Server</name>
@@ -943,7 +950,7 @@
   <group>
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
-    <description/>
+    <description>Remote desktop app supporting RDP</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1084,9 +1091,11 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">texlive</packagereq>
+      <packagereq type="mandatory">texlive-acronym</packagereq>
       <packagereq type="mandatory">texlive-adjustbox</packagereq>
       <packagereq type="mandatory">texlive-ae</packagereq>
       <packagereq type="mandatory">texlive-algorithms</packagereq>
+      <packagereq type="mandatory">texlive-alphalph</packagereq>
       <packagereq type="mandatory">texlive-amscls</packagereq>
       <packagereq type="mandatory">texlive-amsfonts</packagereq>
       <packagereq type="mandatory">texlive-amsmath</packagereq>
@@ -1094,7 +1103,11 @@
       <packagereq type="mandatory">texlive-anysize</packagereq>
       <packagereq type="mandatory">texlive-appendix</packagereq>
       <packagereq type="mandatory">texlive-arphic</packagereq>
+      <packagereq type="mandatory">texlive-atbegshi</packagereq>
       <packagereq type="mandatory">texlive-attachfile</packagereq>
+      <packagereq type="mandatory">texlive-attachfile2</packagereq>
+      <packagereq type="mandatory">texlive-atveryend</packagereq>
+      <packagereq type="mandatory">texlive-auxhook</packagereq>
       <packagereq type="mandatory">texlive-avantgar</packagereq>
       <packagereq type="mandatory">texlive-awesomebox</packagereq>
       <packagereq type="mandatory">texlive-babel</packagereq>
@@ -1108,13 +1121,17 @@
       <packagereq type="mandatory">texlive-bibtopic</packagereq>
       <packagereq type="mandatory">texlive-bidi</packagereq>
       <packagereq type="mandatory">texlive-bigfoot</packagereq>
+      <packagereq type="mandatory">texlive-bigintcalc</packagereq>
+      <packagereq type="mandatory">texlive-bitset</packagereq>
       <packagereq type="mandatory">texlive-bookman</packagereq>
+      <packagereq type="mandatory">texlive-bookmark</packagereq>
       <packagereq type="mandatory">texlive-booktabs</packagereq>
       <packagereq type="mandatory">texlive-breakurl</packagereq>
       <packagereq type="mandatory">texlive-breqn</packagereq>
       <packagereq type="mandatory">texlive-capt-of</packagereq>
       <packagereq type="mandatory">texlive-caption</packagereq>
       <packagereq type="mandatory">texlive-carlisle</packagereq>
+      <packagereq type="mandatory">texlive-catchfile</packagereq>
       <packagereq type="mandatory">texlive-changebar</packagereq>
       <packagereq type="mandatory">texlive-changepage</packagereq>
       <packagereq type="mandatory">texlive-charter</packagereq>
@@ -1134,7 +1151,10 @@
       <packagereq type="mandatory">texlive-collection-latex</packagereq>
       <packagereq type="mandatory">texlive-collection-latexrecommended</packagereq>
       <packagereq type="mandatory">texlive-collection-xetex</packagereq>
+      <packagereq type="mandatory">texlive-colorprofiles</packagereq>
       <packagereq type="mandatory">texlive-colortbl</packagereq>
+      <packagereq type="mandatory">texlive-context</packagereq>
+      <packagereq type="mandatory">texlive-count1to</packagereq>
       <packagereq type="mandatory">texlive-courier</packagereq>
       <packagereq type="mandatory">texlive-crop</packagereq>
       <packagereq type="mandatory">texlive-csquotes</packagereq>
@@ -1142,6 +1162,7 @@
       <packagereq type="mandatory">texlive-ctablestack</packagereq>
       <packagereq type="mandatory">texlive-currfile</packagereq>
       <packagereq type="mandatory">texlive-datetime</packagereq>
+      <packagereq type="mandatory">texlive-dehyph</packagereq>
       <packagereq type="mandatory">texlive-dvipdfmx</packagereq>
       <packagereq type="mandatory">texlive-dvipng</packagereq>
       <packagereq type="mandatory">texlive-dvips</packagereq>
@@ -1153,15 +1174,20 @@
       <packagereq type="mandatory">texlive-environ</packagereq>
       <packagereq type="mandatory">texlive-epsf</packagereq>
       <packagereq type="mandatory">texlive-epstopdf</packagereq>
+      <packagereq type="mandatory">texlive-epstopdf-pkg</packagereq>
       <packagereq type="mandatory">texlive-eqparbox</packagereq>
       <packagereq type="mandatory">texlive-eso-pic</packagereq>
       <packagereq type="mandatory">texlive-etex</packagereq>
       <packagereq type="mandatory">texlive-etex-pkg</packagereq>
+      <packagereq type="mandatory">texlive-etexcmds</packagereq>
+      <packagereq type="mandatory">texlive-etoc</packagereq>
       <packagereq type="mandatory">texlive-etoolbox</packagereq>
       <packagereq type="mandatory">texlive-euenc</packagereq>
       <packagereq type="mandatory">texlive-euler</packagereq>
       <packagereq type="mandatory">texlive-euro</packagereq>
       <packagereq type="mandatory">texlive-eurosym</packagereq>
+      <packagereq type="mandatory">texlive-everysel</packagereq>
+      <packagereq type="mandatory">texlive-everyshi</packagereq>
       <packagereq type="mandatory">texlive-extsizes</packagereq>
       <packagereq type="mandatory">texlive-fancybox</packagereq>
       <packagereq type="mandatory">texlive-fancyhdr</packagereq>
@@ -1182,29 +1208,40 @@
       <packagereq type="mandatory">texlive-fontware</packagereq>
       <packagereq type="mandatory">texlive-fontwrap</packagereq>
       <packagereq type="mandatory">texlive-footmisc</packagereq>
+      <packagereq type="mandatory">texlive-footnotehyper</packagereq>
       <packagereq type="mandatory">texlive-fp</packagereq>
       <packagereq type="mandatory">texlive-fpl</packagereq>
       <packagereq type="mandatory">texlive-framed</packagereq>
       <packagereq type="mandatory">texlive-garuda-c90</packagereq>
       <packagereq type="mandatory">texlive-geometry</packagereq>
+      <packagereq type="mandatory">texlive-gettitlestring</packagereq>
       <packagereq type="mandatory">texlive-glyphlist</packagereq>
       <packagereq type="mandatory">texlive-graphics</packagereq>
       <packagereq type="mandatory">texlive-graphics-cfg</packagereq>
       <packagereq type="mandatory">texlive-graphics-def</packagereq>
+      <packagereq type="mandatory">texlive-grfext</packagereq>
+      <packagereq type="mandatory">texlive-grffile</packagereq>
       <packagereq type="mandatory">texlive-gsftopk</packagereq>
+      <packagereq type="mandatory">texlive-hanging</packagereq>
       <packagereq type="mandatory">texlive-helvetic</packagereq>
+      <packagereq type="mandatory">texlive-hobsub</packagereq>
+      <packagereq type="mandatory">texlive-hologo</packagereq>
+      <packagereq type="mandatory">texlive-hopatch</packagereq>
+      <packagereq type="mandatory">texlive-hycolor</packagereq>
+      <packagereq type="mandatory">texlive-hypdoc</packagereq>
       <packagereq type="mandatory">texlive-hyperref</packagereq>
       <packagereq type="mandatory">texlive-hyph-utf8</packagereq>
       <packagereq type="mandatory">texlive-hyphen-base</packagereq>
       <packagereq type="mandatory">texlive-hyphenat</packagereq>
-      <packagereq type="mandatory">texlive-ifetex</packagereq>
-      <packagereq type="mandatory">texlive-ifluatex</packagereq>
+      <packagereq type="mandatory">texlive-hyphenex</packagereq>
       <packagereq type="mandatory">texlive-ifmtarg</packagereq>
       <packagereq type="mandatory">texlive-ifoddpage</packagereq>
+      <packagereq type="mandatory">texlive-ifplatform</packagereq>
       <packagereq type="mandatory">texlive-iftex</packagereq>
-      <packagereq type="mandatory">texlive-ifxetex</packagereq>
       <packagereq type="mandatory">texlive-import</packagereq>
       <packagereq type="mandatory">texlive-index</packagereq>
+      <packagereq type="mandatory">texlive-infwarerr</packagereq>
+      <packagereq type="mandatory">texlive-intcalc</packagereq>
       <packagereq type="mandatory">texlive-jadetex</packagereq>
       <packagereq type="mandatory">texlive-jknapltx</packagereq>
       <packagereq type="mandatory">texlive-kastrup</packagereq>
@@ -1213,6 +1250,10 @@
       <packagereq type="mandatory">texlive-knuth-local</packagereq>
       <packagereq type="mandatory">texlive-koma-script</packagereq>
       <packagereq type="mandatory">texlive-kpathsea</packagereq>
+      <packagereq type="mandatory">texlive-kvdefinekeys</packagereq>
+      <packagereq type="mandatory">texlive-kvoptions</packagereq>
+      <packagereq type="mandatory">texlive-kvsetkeys</packagereq>
+      <packagereq type="mandatory">texlive-l3backend</packagereq>
       <packagereq type="mandatory">texlive-l3experimental</packagereq>
       <packagereq type="mandatory">texlive-l3kernel</packagereq>
       <packagereq type="mandatory">texlive-l3packages</packagereq>
@@ -1220,23 +1261,30 @@
       <packagereq type="mandatory">texlive-latex</packagereq>
       <packagereq type="mandatory">texlive-latex-fonts</packagereq>
       <packagereq type="mandatory">texlive-latex2man</packagereq>
+      <packagereq type="mandatory">texlive-latexbug</packagereq>
       <packagereq type="mandatory">texlive-latexconfig</packagereq>
+      <packagereq type="mandatory">texlive-letltxmacro</packagereq>
       <packagereq type="mandatory">texlive-lettrine</packagereq>
       <packagereq type="mandatory">texlive-lib</packagereq>
       <packagereq type="mandatory">texlive-linegoal</packagereq>
       <packagereq type="mandatory">texlive-lineno</packagereq>
       <packagereq type="mandatory">texlive-listings</packagereq>
+      <packagereq type="mandatory">texlive-listofitems</packagereq>
       <packagereq type="mandatory">texlive-lm</packagereq>
       <packagereq type="mandatory">texlive-lm-math</packagereq>
       <packagereq type="mandatory">texlive-ltabptch</packagereq>
+      <packagereq type="mandatory">texlive-ltxcmds</packagereq>
       <packagereq type="mandatory">texlive-ltxmisc</packagereq>
       <packagereq type="mandatory">texlive-lua-alt-getopt</packagereq>
+      <packagereq type="mandatory">texlive-lua-uni-algos</packagereq>
+      <packagereq type="mandatory">texlive-luahbtex</packagereq>
       <packagereq type="mandatory">texlive-lualatex-math</packagereq>
       <packagereq type="mandatory">texlive-lualibs</packagereq>
       <packagereq type="mandatory">texlive-luaotfload</packagereq>
       <packagereq type="mandatory">texlive-luatex</packagereq>
       <packagereq type="mandatory">texlive-luatex85</packagereq>
       <packagereq type="mandatory">texlive-luatexbase</packagereq>
+      <packagereq type="mandatory">texlive-lwarp</packagereq>
       <packagereq type="mandatory">texlive-makecmds</packagereq>
       <packagereq type="mandatory">texlive-makeindex</packagereq>
       <packagereq type="mandatory">texlive-manfnt-font</packagereq>
@@ -1255,17 +1303,22 @@
       <packagereq type="mandatory">texlive-mfnfss</packagereq>
       <packagereq type="mandatory">texlive-mfware</packagereq>
       <packagereq type="mandatory">texlive-microtype</packagereq>
+      <packagereq type="mandatory">texlive-minitoc</packagereq>
       <packagereq type="mandatory">texlive-mnsymbol</packagereq>
+      <packagereq type="mandatory">texlive-modes</packagereq>
       <packagereq type="mandatory">texlive-mparhack</packagereq>
       <packagereq type="mandatory">texlive-mptopdf</packagereq>
-      <packagereq type="mandatory">texlive-ms</packagereq>
       <packagereq type="mandatory">texlive-multido</packagereq>
       <packagereq type="mandatory">texlive-multirow</packagereq>
+      <packagereq type="mandatory">texlive-multitoc</packagereq>
       <packagereq type="mandatory">texlive-natbib</packagereq>
       <packagereq type="mandatory">texlive-ncctools</packagereq>
       <packagereq type="mandatory">texlive-ncntrsbk</packagereq>
       <packagereq type="mandatory">texlive-needspace</packagereq>
+      <packagereq type="mandatory">texlive-newfloat</packagereq>
+      <packagereq type="mandatory">texlive-newunicodechar</packagereq>
       <packagereq type="mandatory">texlive-norasi-c90</packagereq>
+      <packagereq type="mandatory">texlive-notoccite</packagereq>
       <packagereq type="mandatory">texlive-ntgclass</packagereq>
       <packagereq type="mandatory">texlive-oberdiek</packagereq>
       <packagereq type="mandatory">texlive-overpic</packagereq>
@@ -1274,11 +1327,19 @@
       <packagereq type="mandatory">texlive-parallel</packagereq>
       <packagereq type="mandatory">texlive-parskip</packagereq>
       <packagereq type="mandatory">texlive-passivetex</packagereq>
+      <packagereq type="mandatory">texlive-pdfcol</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolfoot</packagereq>
+      <packagereq type="mandatory">texlive-pdfcolmk</packagereq>
+      <packagereq type="mandatory">texlive-pdfescape</packagereq>
+      <packagereq type="mandatory">texlive-pdflscape</packagereq>
+      <packagereq type="mandatory">texlive-pdfmanagement-testphase</packagereq>
       <packagereq type="mandatory">texlive-pdfpages</packagereq>
       <packagereq type="mandatory">texlive-pdftex</packagereq>
+      <packagereq type="mandatory">texlive-pdftexcmds</packagereq>
       <packagereq type="mandatory">texlive-pgf</packagereq>
       <packagereq type="mandatory">texlive-philokalia</packagereq>
       <packagereq type="mandatory">texlive-placeins</packagereq>
+      <packagereq type="mandatory">texlive-plain</packagereq>
       <packagereq type="mandatory">texlive-polyglossia</packagereq>
       <packagereq type="mandatory">texlive-powerdot</packagereq>
       <packagereq type="mandatory">texlive-preprint</packagereq>
@@ -1287,6 +1348,7 @@
       <packagereq type="mandatory">texlive-psnfss</packagereq>
       <packagereq type="mandatory">texlive-pspicture</packagereq>
       <packagereq type="mandatory">texlive-pst-3d</packagereq>
+      <packagereq type="mandatory">texlive-pst-arrow</packagereq>
       <packagereq type="mandatory">texlive-pst-blur</packagereq>
       <packagereq type="mandatory">texlive-pst-coil</packagereq>
       <packagereq type="mandatory">texlive-pst-eps</packagereq>
@@ -1297,16 +1359,22 @@
       <packagereq type="mandatory">texlive-pst-plot</packagereq>
       <packagereq type="mandatory">texlive-pst-slpe</packagereq>
       <packagereq type="mandatory">texlive-pst-text</packagereq>
+      <packagereq type="mandatory">texlive-pst-tools</packagereq>
       <packagereq type="mandatory">texlive-pst-tree</packagereq>
       <packagereq type="mandatory">texlive-pstricks</packagereq>
       <packagereq type="mandatory">texlive-pstricks-add</packagereq>
       <packagereq type="mandatory">texlive-ptext</packagereq>
       <packagereq type="mandatory">texlive-pxfonts</packagereq>
       <packagereq type="mandatory">texlive-qstest</packagereq>
+      <packagereq type="mandatory">texlive-ragged2e</packagereq>
       <packagereq type="mandatory">texlive-rcs</packagereq>
       <packagereq type="mandatory">texlive-realscripts</packagereq>
+      <packagereq type="mandatory">texlive-refcount</packagereq>
+      <packagereq type="mandatory">texlive-relsize</packagereq>
+      <packagereq type="mandatory">texlive-rerunfilecheck</packagereq>
       <packagereq type="mandatory">texlive-rsfs</packagereq>
       <packagereq type="mandatory">texlive-sansmath</packagereq>
+      <packagereq type="mandatory">texlive-sansmathaccent</packagereq>
       <packagereq type="mandatory">texlive-sauerj</packagereq>
       <packagereq type="mandatory">texlive-scheme-basic</packagereq>
       <packagereq type="mandatory">texlive-section</packagereq>
@@ -1314,9 +1382,12 @@
       <packagereq type="mandatory">texlive-seminar</packagereq>
       <packagereq type="mandatory">texlive-sepnum</packagereq>
       <packagereq type="mandatory">texlive-setspace</packagereq>
+      <packagereq type="mandatory">texlive-sfmath</packagereq>
       <packagereq type="mandatory">texlive-showexpl</packagereq>
       <packagereq type="mandatory">texlive-soul</packagereq>
+      <packagereq type="mandatory">texlive-stackengine</packagereq>
       <packagereq type="mandatory">texlive-stmaryrd</packagereq>
+      <packagereq type="mandatory">texlive-stringenc</packagereq>
       <packagereq type="mandatory">texlive-subfig</packagereq>
       <packagereq type="mandatory">texlive-subfigure</packagereq>
       <packagereq type="mandatory">texlive-svn-prov</packagereq>
@@ -1324,7 +1395,6 @@
       <packagereq type="mandatory">texlive-t2</packagereq>
       <packagereq type="mandatory">texlive-tabu</packagereq>
       <packagereq type="mandatory">texlive-tabulary</packagereq>
-      <packagereq type="mandatory">texlive-tetex</packagereq>
       <packagereq type="mandatory">texlive-tex</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre</packagereq>
       <packagereq type="mandatory">texlive-tex-gyre-math</packagereq>
@@ -1334,6 +1404,7 @@
       <packagereq type="mandatory">texlive-texlive-en</packagereq>
       <packagereq type="mandatory">texlive-texlive-msg-translations</packagereq>
       <packagereq type="mandatory">texlive-texlive-scripts</packagereq>
+      <packagereq type="mandatory">texlive-texlive-scripts-extra</packagereq>
       <packagereq type="mandatory">texlive-texlive.infra</packagereq>
       <packagereq type="mandatory">texlive-textcase</packagereq>
       <packagereq type="mandatory">texlive-textpos</packagereq>
@@ -1345,10 +1416,12 @@
       <packagereq type="mandatory">texlive-titling</packagereq>
       <packagereq type="mandatory">texlive-tocloft</packagereq>
       <packagereq type="mandatory">texlive-tools</packagereq>
+      <packagereq type="mandatory">texlive-translator</packagereq>
       <packagereq type="mandatory">texlive-trimspaces</packagereq>
       <packagereq type="mandatory">texlive-txfonts</packagereq>
       <packagereq type="mandatory">texlive-type1cm</packagereq>
       <packagereq type="mandatory">texlive-typehtml</packagereq>
+      <packagereq type="mandatory">texlive-ucharcat</packagereq>
       <packagereq type="mandatory">texlive-ucharclasses</packagereq>
       <packagereq type="mandatory">texlive-ucs</packagereq>
       <packagereq type="mandatory">texlive-uhc</packagereq>
@@ -1356,6 +1429,7 @@
       <packagereq type="mandatory">texlive-underscore</packagereq>
       <packagereq type="mandatory">texlive-unicode-data</packagereq>
       <packagereq type="mandatory">texlive-unicode-math</packagereq>
+      <packagereq type="mandatory">texlive-uniquecounter</packagereq>
       <packagereq type="mandatory">texlive-unisugar</packagereq>
       <packagereq type="mandatory">texlive-upquote</packagereq>
       <packagereq type="mandatory">texlive-url</packagereq>
@@ -1364,6 +1438,7 @@
       <packagereq type="mandatory">texlive-wadalab</packagereq>
       <packagereq type="mandatory">texlive-was</packagereq>
       <packagereq type="mandatory">texlive-wasy</packagereq>
+      <packagereq type="mandatory">texlive-wasy-type1</packagereq>
       <packagereq type="mandatory">texlive-wasysym</packagereq>
       <packagereq type="mandatory">texlive-wrapfig</packagereq>
       <packagereq type="mandatory">texlive-xcolor</packagereq>
@@ -1378,16 +1453,18 @@
       <packagereq type="mandatory">texlive-xetex-pstricks</packagereq>
       <packagereq type="mandatory">texlive-xetexconfig</packagereq>
       <packagereq type="mandatory">texlive-xetexfontinfo</packagereq>
+      <packagereq type="mandatory">texlive-xfrac</packagereq>
       <packagereq type="mandatory">texlive-xifthen</packagereq>
       <packagereq type="mandatory">texlive-xkeyval</packagereq>
       <packagereq type="mandatory">texlive-xltxtra</packagereq>
       <packagereq type="mandatory">texlive-xmltex</packagereq>
-      <packagereq type="mandatory">texlive-xmltexconfig</packagereq>
+      <packagereq type="mandatory">texlive-xpatch</packagereq>
       <packagereq type="mandatory">texlive-xstring</packagereq>
       <packagereq type="mandatory">texlive-xtab</packagereq>
       <packagereq type="mandatory">texlive-xunicode</packagereq>
       <packagereq type="mandatory">texlive-zapfchan</packagereq>
       <packagereq type="mandatory">texlive-zapfding</packagereq>
+      <packagereq type="mandatory">texlive-zref</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1526,6 +1603,7 @@
       <groupid>debugging</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid>infiniband</groupid>
+      <groupid>java-platform</groupid>
       <groupid>network-tools</groupid>
       <groupid>performance</groupid>
       <groupid>print-client</groupid>
@@ -1554,7 +1632,6 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
     </grouplist>
   </category>
@@ -1668,7 +1745,6 @@
     </grouplist>
     <optionlist>
       <groupid>backup-client</groupid>
-      <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
diff --git a/comps/BaseOS-aarch64.xml b/comps/BaseOS-aarch64.xml
index f305d13..6dc9aaf 100644
--- a/comps/BaseOS-aarch64.xml
+++ b/comps/BaseOS-aarch64.xml
@@ -270,7 +270,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps/BaseOS-ppc64le.xml b/comps/BaseOS-ppc64le.xml
index 701e366..a3d4144 100644
--- a/comps/BaseOS-ppc64le.xml
+++ b/comps/BaseOS-ppc64le.xml
@@ -272,7 +272,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps/BaseOS-s390x.xml b/comps/BaseOS-s390x.xml
index 3cb23de..2454e3f 100644
--- a/comps/BaseOS-s390x.xml
+++ b/comps/BaseOS-s390x.xml
@@ -264,7 +264,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps/BaseOS-x86_64.xml b/comps/BaseOS-x86_64.xml
index 45187f8..ca0b80d 100644
--- a/comps/BaseOS-x86_64.xml
+++ b/comps/BaseOS-x86_64.xml
@@ -280,7 +280,7 @@
   <group>
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps/CRB-aarch64.xml b/comps/CRB-aarch64.xml
index 39b3d01..bdfcc27 100644
--- a/comps/CRB-aarch64.xml
+++ b/comps/CRB-aarch64.xml
@@ -501,6 +501,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -546,6 +547,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
       <packagereq type="default">librabbitmq-devel</packagereq>
@@ -1243,7 +1245,6 @@
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-java-javadoc</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">yelp-xsl-devel</packagereq>
       <packagereq type="default">zlib-ng</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
diff --git a/comps/CRB-ppc64le.xml b/comps/CRB-ppc64le.xml
index dabae49..08a2d20 100644
--- a/comps/CRB-ppc64le.xml
+++ b/comps/CRB-ppc64le.xml
@@ -495,6 +495,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -542,6 +543,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
       <packagereq type="default">librabbitmq-devel</packagereq>
@@ -1235,7 +1237,6 @@
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-java-javadoc</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">yelp-xsl-devel</packagereq>
       <packagereq type="default">zlib-ng</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
diff --git a/comps/CRB-s390x.xml b/comps/CRB-s390x.xml
index bc2cbe7..98f4106 100644
--- a/comps/CRB-s390x.xml
+++ b/comps/CRB-s390x.xml
@@ -486,6 +486,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -531,6 +532,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
       <packagereq type="default">librabbitmq-devel</packagereq>
@@ -1229,7 +1231,6 @@
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-java-javadoc</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">yelp-xsl-devel</packagereq>
       <packagereq type="default">zlib-ng</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
diff --git a/comps/CRB-x86_64.xml b/comps/CRB-x86_64.xml
index acc11ae..a39b75f 100644
--- a/comps/CRB-x86_64.xml
+++ b/comps/CRB-x86_64.xml
@@ -503,6 +503,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -548,6 +549,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default">libpsm2-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
@@ -1283,7 +1285,6 @@
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-java-javadoc</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
-      <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">yelp-xsl-devel</packagereq>
       <packagereq type="default">zlib-ng</packagereq>
       <packagereq type="default">zlib-ng-compat-static</packagereq>
diff --git a/hidden.cfg b/hidden.cfg
index 3a1a08c..b7b1aa1 100644
--- a/hidden.cfg
+++ b/hidden.cfg
@@ -4098,3 +4098,18 @@ package {
     include_filter: "qat-zstd-plugin.x86_64"
   }
 }
+package {
+  name: "yajl"
+  type: PACKAGE_TYPE_NORMAL_FORK
+  repository {
+    name: "hidden"
+    include_filter: "yajl.aarch64"
+    include_filter: "yajl.ppc64le"
+    include_filter: "yajl.s390x"
+    include_filter: "yajl.x86_64"
+    include_filter: "yajl-devel.aarch64"
+    include_filter: "yajl-devel.ppc64le"
+    include_filter: "yajl-devel.s390x"
+    include_filter: "yajl-devel.x86_64"
+  }
+}