From 65068fb2edc98afa6fffc85df85ea00bd77e07e2 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 17 Jun 2024 02:06:47 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml.in | 154 ++++++---------------------------------
 comps-rocky-9-lh.xml.in  |   2 +-
 2 files changed, 23 insertions(+), 133 deletions(-)

diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 3d398c9..a1a31d1 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -27,7 +27,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="AppStream">atlas-devel</packagereq>
       <packagereq variant="AppStream">audit-libs-devel</packagereq>
       <packagereq variant="AppStream">bzip2-devel</packagereq>
       <packagereq variant="AppStream">c-ares-devel</packagereq>
@@ -59,7 +58,7 @@
       <packagereq variant="AppStream">numactl-devel</packagereq>
       <packagereq arch="aarch64,ppc64le,x86_64" variant="AppStream">papi-devel</packagereq>
       <packagereq variant="AppStream">pciutils-devel</packagereq>
-      <packagereq variant="AppStream">pcre-devel</packagereq>
+      <packagereq variant="AppStream">pcre2-devel</packagereq>
       <packagereq variant="AppStream">polkit-devel</packagereq>
       <packagereq variant="AppStream">popt-devel</packagereq>
       <packagereq type="optional" arch="s390x" variant="AppStream">qclib</packagereq>
@@ -77,7 +76,6 @@
       <packagereq variant="AppStream">binutils-devel</packagereq>
       <packagereq variant="AppStream">boost-devel</packagereq>
       <packagereq variant="AppStream">cups-devel</packagereq>
-      <packagereq variant="AppStream">compat-libgfortran-48</packagereq>
       <packagereq variant="AppStream">dbus-glib-devel</packagereq>
       <packagereq variant="AppStream">evolution-data-server-devel</packagereq>
       <packagereq type="optional" variant="AppStream">flatpak</packagereq>
@@ -87,7 +85,6 @@
       <packagereq variant="AppStream">gd-devel</packagereq>
       <packagereq variant="AppStream">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream">gnutls-devel</packagereq>
-      <packagereq variant="AppStream">gpm-devel</packagereq>
       <packagereq variant="AppStream">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream">gvfs-devel</packagereq>
@@ -97,17 +94,10 @@
       <packagereq variant="AppStream">libdrm-devel</packagereq>
       <packagereq variant="AppStream">libva-devel</packagereq>
       <packagereq variant="AppStream">libnotify-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmem-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmemblk-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmemlog-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmemobj-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmemobj++-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmemobj++-doc</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">libpmempool-devel</packagereq>
       <packagereq variant="AppStream">libpq-devel</packagereq>
       <packagereq variant="AppStream">librsvg2-devel</packagereq>
       <packagereq variant="AppStream">librsvg2-tools</packagereq>
-      <packagereq variant="AppStream">libsoup-devel</packagereq>
+      <packagereq variant="AppStream">libsoup3-devel</packagereq>
       <packagereq variant="AppStream">libssh-devel</packagereq>
       <packagereq variant="AppStream">libtiff-devel</packagereq>
       <packagereq variant="AppStream">libXau-devel</packagereq>
@@ -117,7 +107,6 @@
       <packagereq variant="AppStream">libXmu-devel</packagereq>
       <packagereq variant="AppStream">libXrandr-devel</packagereq>
       <packagereq variant="AppStream">libxslt-devel</packagereq>
-      <packagereq variant="AppStream">motif-devel</packagereq>
       <packagereq variant="AppStream">mpfr-devel</packagereq>
       <packagereq variant="AppStream">net-snmp-devel</packagereq>
       <packagereq variant="AppStream">newt-devel</packagereq>
@@ -142,7 +131,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="AppStream">authselect-compat</packagereq>
       <packagereq variant="BaseOS">chrony</packagereq>
       <packagereq variant="BaseOS">cryptsetup</packagereq>
       <packagereq variant="BaseOS">device-mapper-multipath</packagereq>
@@ -175,7 +163,6 @@
       <packagereq variant="BaseOS" arch="aarch64">shim-aa64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">shim-x64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">syslinux-extlinux</packagereq>
-      <packagereq variant="BaseOS">teamd</packagereq>
       <packagereq variant="BaseOS">tmux</packagereq>
       <packagereq variant="BaseOS">xfsprogs</packagereq>
     </packagelist>
@@ -191,12 +178,8 @@
       <packagereq variant="AppStream">mesa-dri-drivers</packagereq>
       <packagereq variant="AppStream">plymouth-system-theme</packagereq>
       <packagereq variant="AppStream">xorg-x11-drv-evdev</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">xorg-x11-drv-fbdev</packagereq>
       <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="AppStream" arch="x86_64">xorg-x11-drv-vmware</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-wacom</packagereq>
       <packagereq variant="AppStream">xorg-x11-server-Xorg</packagereq>
-      <packagereq variant="AppStream">xorg-x11-utils</packagereq>
       <packagereq variant="AppStream">xorg-x11-xauth</packagereq>
       <packagereq variant="AppStream">xorg-x11-xinit</packagereq>
       <packagereq variant="AppStream">xorg-x11-xinit-session</packagereq>
@@ -281,20 +264,9 @@
       <packagereq type="default" variant="BaseOS">prefixdevname</packagereq>
       <packagereq type="default" variant="BaseOS">dnf-plugins-core</packagereq>
       <packagereq type="default" variant="BaseOS">dracut-config-rescue</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl100-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl105-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl135-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl1000-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl2000-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl2030-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl3160-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl5000-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl5150-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl6000g2a-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl6050-firmware</packagereq>
-      <packagereq type="default" variant="BaseOS" arch="x86_64">iwl7260-firmware</packagereq>
+      <packagereq type="default" variant="BaseOS" arch="x86_64">iwlwifi-dvm-firmware</packagereq>
+      <packagereq type="default" variant="BaseOS" arch="x86_64">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager</packagereq>
-      <packagereq type="default" variant="BaseOS">NetworkManager-team</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager-tui</packagereq>
       <packagereq type="default" variant="BaseOS">libsysfs</packagereq>
       <packagereq type="default" variant="BaseOS">linux-firmware</packagereq>
@@ -316,7 +288,6 @@
       <packagereq type="optional" variant="BaseOS">rdma-core</packagereq>
       <packagereq type="optional" variant="BaseOS">selinux-policy-mls</packagereq>
       <packagereq type="optional" variant="BaseOS" arch="x86_64">tboot</packagereq>
-      <packagereq type="optional" variant="AppStream">initial-setup</packagereq>
     </packagelist>
   </group>
   <group>
@@ -416,7 +387,6 @@
       <packagereq variant="AppStream">dconf</packagereq>
       <packagereq arch="ppc64le,x86_64" variant="AppStream">loupe</packagereq>
       <packagereq variant="AppStream">evince</packagereq>
-      <packagereq variant="AppStream">evince-nautilus</packagereq>
       <packagereq arch="ppc64le,x86_64" variant="AppStream">fprintd-pam</packagereq>
       <packagereq variant="AppStream">gdm</packagereq>
       <packagereq variant="AppStream">gnome-text-editor</packagereq>
@@ -428,7 +398,6 @@
       <packagereq variant="AppStream">gnome-disk-utility</packagereq>
       <packagereq variant="AppStream">gnome-font-viewer</packagereq>
       <packagereq variant="AppStream">gnome-initial-setup</packagereq>
-      <packagereq type="optional" variant="AppStream">initial-setup-gui</packagereq>
       <packagereq variant="AppStream">gnome-logs</packagereq>
       <packagereq variant="AppStream">gnome-remote-desktop</packagereq>
       <packagereq variant="AppStream">gnome-session-wayland-session</packagereq>
@@ -525,19 +494,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">bolt</packagereq>
-      <packagereq type="default">iwl100-firmware</packagereq>
-      <packagereq type="default">iwl1000-firmware</packagereq>
-      <packagereq type="default">iwl105-firmware</packagereq>
-      <packagereq type="default">iwl135-firmware</packagereq>
-      <packagereq type="default">iwl2000-firmware</packagereq>
-      <packagereq type="default">iwl2030-firmware</packagereq>
-      <packagereq type="default">iwl3160-firmware</packagereq>
-      <packagereq type="default">iwl5000-firmware</packagereq>
-      <packagereq type="default">iwl5150-firmware</packagereq>
-      <packagereq type="default">iwl6000g2a-firmware</packagereq>
-      <packagereq type="default">iwl6000g2b-firmware</packagereq>
-      <packagereq type="default">iwl6050-firmware</packagereq>
-      <packagereq type="default">iwl7260-firmware</packagereq>
+      <packagereq type="default">iwlwifi-dvm-firmware</packagereq>
+      <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
       <packagereq type="default">usb_modeswitch</packagereq>
@@ -597,7 +555,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64,s390x">numactl</packagereq>
-      <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64">numad</packagereq>
       <packagereq type="default">hwloc</packagereq>
       <packagereq type="optional" arch="ppc64le,x86_64">numatop</packagereq>
     </packagelist>
@@ -620,22 +577,6 @@
       <packagereq type="optional" variant="AppStream">ypserv</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>legacy-x</id>
-    <_name>Legacy X Window System Compatibility</_name>
-    <_description>Compatibility programs for migration from or working with legacy X Window System environments.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">libXmu</packagereq>
-      <packagereq type="default">libXp</packagereq>
-      <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-misc</packagereq>
-      <packagereq type="default">motif</packagereq>
-      <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
-      <packagereq type="optional">xterm</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
@@ -653,9 +594,6 @@
       <packagereq type="optional" variant="AppStream">postfix-ldap</packagereq>
       <packagereq type="optional" variant="AppStream">postfix-pcre</packagereq>
       <packagereq type="optional" variant="AppStream">postfix-sqlite</packagereq>
-      <packagereq type="optional" variant="AppStream">sendmail</packagereq>
-      <packagereq type="optional" variant="AppStream">sendmail-cf</packagereq>
-      <packagereq type="optional" variant="AppStream">sendmail-doc</packagereq>
     </packagelist>
   </group>
   <group>
@@ -758,7 +696,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory" variant="AppStream">blktrace</packagereq>
-      <packagereq type="default" variant="BaseOS">iotop</packagereq>
+      <packagereq type="default" variant="BaseOS">iotop-c</packagereq>
       <packagereq type="default" variant="AppStream">perf</packagereq>
       <packagereq type="default" variant="BaseOS">elfutils</packagereq>
       <packagereq type="default" variant="BaseOS">strace</packagereq>
@@ -896,8 +834,6 @@
       <packagereq variant="AppStream">cairo-devel</packagereq>
       <packagereq variant="AppStream">dbus-devel</packagereq>
       <packagereq variant="AppStream">desktop-file-utils</packagereq>
-      <packagereq variant="AppStream">gtk2-devel</packagereq>
-      <packagereq variant="AppStream">gtk2-devel-docs</packagereq>
       <packagereq variant="AppStream">gtk3-devel</packagereq>
       <packagereq variant="AppStream">libdb-devel</packagereq>
       <packagereq variant="AppStream">libICE-devel</packagereq>
@@ -912,7 +848,6 @@
       <packagereq variant="AppStream">libxshmfence-devel</packagereq>
       <packagereq variant="AppStream">libXtst-devel</packagereq>
       <packagereq variant="AppStream">libXv-devel</packagereq>
-      <packagereq variant="AppStream">libXxf86dga-devel</packagereq>
       <packagereq variant="AppStream">libjpeg-turbo-devel</packagereq>
       <packagereq variant="AppStream">libstdc++-devel</packagereq>
       <packagereq variant="AppStream">libxml2-devel</packagereq>
@@ -926,14 +861,10 @@
       <packagereq variant="AppStream">qt6-qtbase-odbc</packagereq>
       <packagereq variant="AppStream">qt6-qtbase-postgresql</packagereq>
       <packagereq variant="AppStream">qt6-qtconnectivity-devel</packagereq>
-      <packagereq variant="AppStream">qt6-qtdoc</packagereq>
-      <packagereq variant="AppStream">qt6-qtgraphicaleffects</packagereq>
       <packagereq variant="AppStream">qt6-qtimageformats</packagereq>
       <packagereq variant="AppStream">qt6-qtlocation-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtmultimedia-devel</packagereq>
-      <packagereq variant="AppStream">qt6-qtquickcontrols</packagereq>
       <packagereq variant="AppStream">qt6-qtquickcontrols2</packagereq>
-      <packagereq variant="AppStream">qt6-qtscript-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtsensors-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtserialport-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtsvg-devel</packagereq>
@@ -941,8 +872,6 @@
       <packagereq variant="AppStream">qt6-qttranslations</packagereq>
       <packagereq variant="AppStream">qt6-qtwebchannel-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtwebsockets-devel</packagereq>
-      <packagereq variant="AppStream">qt6-qtx11extras-devel</packagereq>
-      <packagereq variant="AppStream">qt6-qtxmlpatterns-devel</packagereq>
       <packagereq variant="AppStream">qt6-qtserialbus</packagereq>
       <packagereq arch="x86_64,ppc64le,aarch64" variant="AppStream">qt6-qtwayland</packagereq>
       <packagereq type="optional" variant="AppStream">spirv-tools</packagereq>
@@ -976,7 +905,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional" variant="BaseOS">atlas</packagereq>
       <packagereq type="optional" variant="BaseOS">units</packagereq>
       <packagereq type="optional" variant="AppStream">fftw</packagereq>
       <packagereq type="optional" variant="AppStream">fftw-devel</packagereq>
@@ -1025,7 +953,6 @@
       <packagereq type="optional" variant="BaseOS">opensc</packagereq>
       <packagereq type="optional" variant="BaseOS">openssl-pkcs11</packagereq>
       <packagereq type="optional" variant="BaseOS">sssd-polkit-rules</packagereq>
-      <packagereq type="default" variant="AppStream">esc</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1041,7 +968,6 @@
       <packagereq type="mandatory" variant="BaseOS">polkit</packagereq>
       <packagereq type="mandatory" variant="BaseOS">realmd</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager-config-server</packagereq>
-      <packagereq type="default" variant="BaseOS">NetworkManager-team</packagereq>
       <packagereq type="default" variant="AppStream">PackageKit</packagereq>
     </packagelist>
   </group>
@@ -1120,7 +1046,6 @@
       <packagereq type="default" variant="BaseOS">mtr</packagereq>
       <packagereq type="default" variant="BaseOS">nano</packagereq>
       <packagereq type="default" variant="BaseOS">nvme-cli</packagereq>
-      <packagereq type="default" variant="AppStream">pinfo</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">powerpc-utils</packagereq>
       <packagereq type="default" variant="AppStream">plymouth</packagereq>
@@ -1136,12 +1061,9 @@
       <packagereq type="default" variant="BaseOS">sos</packagereq>
       <packagereq type="default" variant="BaseOS">sssd</packagereq>
       <packagereq type="default" variant="BaseOS">strace</packagereq>
-      <packagereq type="default" variant="BaseOS">teamd</packagereq>
       <packagereq type="default" variant="BaseOS">time</packagereq>
       <packagereq type="default" variant="BaseOS">unzip</packagereq>
       <packagereq type="default" variant="BaseOS">usbutils</packagereq>
-      <packagereq type="default" variant="BaseOS">vdo</packagereq>
-      <packagereq type="optional" variant="BaseOS">vdo-support</packagereq>
       <packagereq type="default" variant="BaseOS">virt-what</packagereq>
       <packagereq type="default" variant="BaseOS">which</packagereq>
       <packagereq type="default" variant="BaseOS">words</packagereq>
@@ -1227,7 +1149,6 @@
       <packagereq type="default" variant="BaseOS">mtr</packagereq>
       <packagereq type="default" variant="BaseOS">nano</packagereq>
       <packagereq type="default" variant="BaseOS">nvme-cli</packagereq>
-      <packagereq type="default" variant="AppStream">pinfo</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">powerpc-utils</packagereq>
       <packagereq type="default" variant="AppStream">plymouth</packagereq>
@@ -1243,12 +1164,9 @@
       <packagereq type="default" variant="BaseOS">sos</packagereq>
       <packagereq type="default" variant="BaseOS">sssd</packagereq>
       <packagereq type="default" variant="BaseOS">strace</packagereq>
-      <packagereq type="default" variant="BaseOS">teamd</packagereq>
       <packagereq type="default" variant="BaseOS">time</packagereq>
       <packagereq type="default" variant="BaseOS">unzip</packagereq>
       <packagereq type="default" variant="BaseOS">usbutils</packagereq>
-      <packagereq type="default" variant="BaseOS">vdo</packagereq>
-      <packagereq type="optional" variant="BaseOS">vdo-support</packagereq>
       <packagereq type="default" variant="BaseOS">virt-what</packagereq>
       <packagereq type="default" variant="BaseOS">which</packagereq>
       <packagereq type="default" variant="BaseOS">words</packagereq>
@@ -1290,7 +1208,7 @@
       <packagereq type="optional" variant="BaseOS">chrpath</packagereq>
       <packagereq type="optional" variant="BaseOS">environment-modules</packagereq>
       <packagereq type="optional" variant="BaseOS">fuse</packagereq>
-      <packagereq type="optional" variant="BaseOS">iotop</packagereq>
+      <packagereq type="optional" variant="BaseOS">iotop-c</packagereq>
       <packagereq type="optional" variant="BaseOS">lzop</packagereq>
       <packagereq type="optional" variant="BaseOS">hardlink</packagereq>
       <packagereq type="default" variant="AppStream">libreswan</packagereq>
@@ -1302,15 +1220,12 @@
       <packagereq type="optional" variant="AppStream">convmv</packagereq>
       <packagereq type="optional" variant="AppStream">createrepo_c</packagereq>
       <packagereq type="optional" variant="AppStream">freerdp</packagereq>
-      <packagereq type="optional" variant="AppStream">gpm</packagereq>
       <packagereq type="optional" variant="AppStream">mc</packagereq>
       <packagereq type="optional" variant="AppStream">mrtg</packagereq>
-      <packagereq type="optional" variant="AppStream">mtx</packagereq>
       <packagereq type="optional" variant="AppStream">net-snmp-utils</packagereq>
       <packagereq type="optional" variant="AppStream">oddjob</packagereq>
       <packagereq type="optional" variant="AppStream">oddjob-mkhomedir</packagereq>
       <packagereq type="optional" variant="AppStream">PackageKit-command-not-found</packagereq>
-      <packagereq type="optional" arch="x86_64" variant="AppStream">pmdk-convert</packagereq>
       <packagereq type="optional" arch="ppc64le,x86_64,s390x" variant="AppStream">rear</packagereq>
       <packagereq type="optional" variant="AppStream">speech-dispatcher</packagereq>
       <packagereq type="optional" variant="AppStream">speech-dispatcher-espeak-ng</packagereq>
@@ -1339,7 +1254,6 @@
       <packagereq>texlive-anyfontsize</packagereq>
       <packagereq>texlive-anysize</packagereq>
       <packagereq>texlive-appendix</packagereq>
-      <packagereq>texlive-arabxetex</packagereq>
       <packagereq>texlive-arphic</packagereq>
       <packagereq>texlive-attachfile</packagereq>
       <packagereq>texlive-avantgar</packagereq>
@@ -1366,7 +1280,6 @@
       <packagereq>texlive-charter</packagereq>
       <packagereq>texlive-chngcntr</packagereq>
       <packagereq>texlive-cite</packagereq>
-      <packagereq>texlive-cjk</packagereq>
       <packagereq>texlive-classpack</packagereq>
       <packagereq>texlive-cm</packagereq>
       <packagereq>texlive-cm-lgc</packagereq>
@@ -1563,7 +1476,6 @@
       <packagereq>texlive-tex-ini-files</packagereq>
       <packagereq>texlive-texconfig</packagereq>
       <packagereq>texlive-texlive-common-doc</packagereq>
-      <packagereq>texlive-texlive-docindex</packagereq>
       <packagereq>texlive-texlive-en</packagereq>
       <packagereq>texlive-texlive-msg-translations</packagereq>
       <packagereq>texlive-texlive-scripts</packagereq>
@@ -1590,7 +1502,6 @@
       <packagereq>texlive-unicode-data</packagereq>
       <packagereq>texlive-unicode-math</packagereq>
       <packagereq>texlive-unisugar</packagereq>
-      <packagereq>texlive-updmap-map</packagereq>
       <packagereq>texlive-upquote</packagereq>
       <packagereq>texlive-url</packagereq>
       <packagereq>texlive-utopia</packagereq>
@@ -1602,7 +1513,6 @@
       <packagereq>texlive-wasysym</packagereq>
       <packagereq>texlive-wrapfig</packagereq>
       <packagereq>texlive-xcolor</packagereq>
-      <packagereq>texlive-xecjk</packagereq>
       <packagereq>texlive-xecolor</packagereq>
       <packagereq>texlive-xecyr</packagereq>
       <packagereq>texlive-xeindex</packagereq>
@@ -1610,7 +1520,6 @@
       <packagereq>texlive-xesearch</packagereq>
       <packagereq>texlive-xetex-itrans</packagereq>
       <packagereq>texlive-xetex-pstricks</packagereq>
-      <packagereq>texlive-xetex-tibetan</packagereq>
       <packagereq>texlive-xetexconfig</packagereq>
       <packagereq>texlive-xetexfontinfo</packagereq>
       <packagereq>texlive-xifthen</packagereq>
@@ -1657,9 +1566,6 @@
       <packagereq type="default">mod_ssl</packagereq>
       <packagereq type="optional">memcached</packagereq>
       <packagereq type="optional">mod_auth_gssapi</packagereq>
-      <packagereq type="optional">mod_security</packagereq>
-      <packagereq type="optional">mod_security-mlogc</packagereq>
-      <packagereq type="optional">mod_security_crs</packagereq>
     </packagelist>
   </group>
   <group arch="aarch64,s390x,x86_64,ppc64le">
@@ -1702,7 +1608,6 @@
       <packagereq variant="BaseOS">net-tools</packagereq>
       <packagereq variant="BaseOS">nfs-utils</packagereq>
       <packagereq variant="BaseOS">pciutils</packagereq>
-      <packagereq variant="AppStream">pinfo</packagereq>
       <packagereq variant="AppStream">plymouth</packagereq>
       <packagereq variant="BaseOS">polkit</packagereq>
       <packagereq variant="BaseOS">psacct</packagereq>
@@ -1725,16 +1630,11 @@
       <packagereq variant="BaseOS">which</packagereq>
       <packagereq variant="BaseOS">words</packagereq>
       <packagereq variant="BaseOS">zip</packagereq>
-      <packagereq variant="AppStream">adwaita-qt6</packagereq>
       <packagereq variant="AppStream">bind-utils</packagereq>
-      <packagereq variant="AppStream">evolution</packagereq>
-      <packagereq variant="AppStream">evolution-ews</packagereq>
-      <packagereq variant="AppStream">evolution-help</packagereq>
       <packagereq variant="AppStream">git</packagereq>
       <packagereq variant="AppStream">google-noto-emoji-fonts</packagereq>
       <packagereq variant="AppStream">hunspell</packagereq>
       <packagereq variant="AppStream">ibus-anthy</packagereq>
-      <packagereq variant="AppStream">ibus-gtk2</packagereq>
       <packagereq variant="AppStream">ibus-gtk3</packagereq>
       <packagereq variant="AppStream">ibus-hangul</packagereq>
       <packagereq variant="AppStream">ibus-libpinyin</packagereq>
@@ -1743,11 +1643,9 @@
       <packagereq variant="AppStream">ibus-typing-booster</packagereq>
       <packagereq variant="AppStream">nmap-ncat</packagereq>
       <packagereq variant="AppStream">pinentry-gnome3</packagereq>
-      <packagereq variant="AppStream">qgnomeplatform</packagereq>
       <packagereq variant="AppStream">qt6-qtbase</packagereq>
       <packagereq variant="AppStream">qt6-qtbase-gui</packagereq>
       <packagereq variant="AppStream">qt6-qtdeclarative</packagereq>
-      <packagereq variant="AppStream">qt6-qtxmlpatterns</packagereq>
       <packagereq variant="AppStream">setroubleshoot</packagereq>
       <packagereq variant="AppStream">telnet</packagereq>
       <packagereq variant="AppStream" arch="x86_64">thermald</packagereq>
@@ -1791,7 +1689,6 @@
       <packagereq type="optional">virt-win-reg</packagereq>
       <packagereq type="optional">guestfs-tools</packagereq>
       <packagereq type="optional">libguestfs-inspect-icons</packagereq>
-      <packagereq type="default" arch="x86_64">virtio-win</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2034,6 +1931,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <!-- Disable java until we have Java 21 which is what we'll ship in RHEL
       <packagereq type="default">java-1.8.0-openjdk-devel</packagereq>
       <packagereq type="default">java-1.8.0-openjdk-demo</packagereq>
       <packagereq type="default">java-1.8.0-openjdk-javadoc</packagereq>
@@ -2053,6 +1951,7 @@
       <packagereq type="default">java-17-openjdk-jmods</packagereq>
       <packagereq type="default">java-17-openjdk-src</packagereq>
       <packagereq type="default">java-17-openjdk-static-libs</packagereq>
+      -->
       <packagereq type="default">ant</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
@@ -2063,7 +1962,7 @@
       <packagereq type="default">ant-apache-xalan2</packagereq>
       <packagereq type="default">ant-commons-logging</packagereq>
       <packagereq type="default">ant-commons-net</packagereq>
-      <packagereq type="default">ant-javamail</packagereq>
+      <packagereq type="default">ant-jakartamail</packagereq>
       <packagereq type="default">ant-jdepend</packagereq>
       <packagereq type="default">ant-jmf</packagereq>
       <packagereq type="default">ant-jsch</packagereq>
@@ -2077,6 +1976,7 @@
       <packagereq type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
+  <!-- Disable java until we have Java 21 which is what we'll ship in RHEL
   <group variant="AppStream">
     <id>java-platform</id>
     <_name>Java Platform</_name>
@@ -2089,6 +1989,7 @@
       <packagereq type="default">java-17-openjdk</packagereq>
     </packagelist>
   </group>
+  -->
   <group variant="AppStream">
     <id>input-methods</id>
     <_name>Input Methods</_name>
@@ -2096,9 +1997,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="gtk2">gtk2-immodule-xim</packagereq>
       <packagereq type="conditional" requires="gtk3">gtk3-immodule-xim</packagereq>
-      <packagereq type="conditional" requires="gtk2">ibus-gtk2</packagereq>
       <packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-hangul</packagereq>
@@ -2171,7 +2070,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>brasero</packagereq>
-      <packagereq>brasero-nautilus</packagereq>
     </packagelist>
   </group>
   <!--  <group variant="AppStream">
@@ -2253,7 +2151,6 @@
     <packagelist>
       <packagereq type="mandatory">buildah</packagereq>
       <packagereq type="mandatory">podman</packagereq>
-      <packagereq type="mandatory">containernetworking-plugins</packagereq>
       <packagereq type="optional">python3-psutil</packagereq>
       <packagereq type="optional">toolbox</packagereq>
     </packagelist>
@@ -2469,21 +2366,20 @@
       <packagereq type="default" variant="AppStream">default-fonts-other-mono</packagereq>
       <packagereq type="default" variant="AppStream">default-fonts-other-sans</packagereq>
       <packagereq type="default" variant="AppStream">default-fonts-other-serif</packagereq>
-      <packagereq type="default" variant="AppStream">dejavu-sans-fonts</packagereq>
-      <packagereq type="default" variant="AppStream">dejavu-serif-fonts</packagereq>
-      <packagereq type="default" variant="AppStream">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default" variant="BaseOS">dejavu-sans-fonts</packagereq>
+      <packagereq type="default" variant="BaseOS">dejavu-serif-fonts</packagereq>
+      <packagereq type="default" variant="BaseOS">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default" variant="AppStream">julietaula-montserrat-fonts</packagereq>
       <packagereq type="default" variant="AppStream">pt-sans-fonts</packagereq>
       <packagereq type="default" variant="AppStream">redhat-display-vf-fonts</packagereq>
-      <packagereq type="default" variant="AppStream">redhat-mono-vf-fonts</packagereq>
-      <packagereq type="default" variant="AppStream">redhat-text-vf-fonts</packagereq>
+      <packagereq type="default" variant="BaseOS">redhat-mono-vf-fonts</packagereq>
+      <packagereq type="default" variant="BaseOS">redhat-text-vf-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">default-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">default-fonts-cjk</packagereq>
       <packagereq type="optional" variant="AppStream">default-fonts-core</packagereq>
       <packagereq type="optional" variant="AppStream">default-fonts-other</packagereq>
       <packagereq type="optional" variant="AppStream">fontawesome-fonts</packagereq>
-      <packagereq type="optional" variant="AppStream">google-arimo-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">google-carlito-fonts</packagereq>
-      <packagereq type="optional" variant="AppStream">google-cousine-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">google-crosextra-caladea-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">google-droid-sans-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">google-droid-sans-mono-fonts</packagereq>
@@ -2494,7 +2390,7 @@
       <packagereq type="optional" variant="AppStream">google-roboto-slab-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">lato-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">open-sans-fonts</packagereq>
-      <packagereq type="optional" variant="AppStream">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional" variant="AppStream">overpass-fonts</packagereq>
       <packagereq type="optional" variant="AppStream">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="optional" variant="AppStream">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional" variant="AppStream">xorg-x11-fonts-misc</packagereq>
@@ -2535,7 +2431,6 @@
       <packagereq type="mandatory">bacula-director</packagereq>
       <packagereq type="mandatory">bacula-storage</packagereq>
       <packagereq>mt-st</packagereq>
-      <packagereq>mtx</packagereq>
     </packagelist>
   </group> -->
   <group variant="AppStream">
@@ -3105,11 +3000,6 @@
       <packagereq type="default">libpeas-devel</packagereq>
       <packagereq type="default">libperf</packagereq>
       <packagereq type="default">libpinyin-devel</packagereq>
-      <packagereq type="default" arch="x86_64">libpmem-debug</packagereq>
-      <packagereq type="default" arch="x86_64">libpmemblk-debug</packagereq>
-      <packagereq type="default" arch="x86_64">libpmemlog-debug</packagereq>
-      <packagereq type="default" arch="x86_64">libpmemobj-debug</packagereq>
-      <packagereq type="default" arch="x86_64">libpmempool-debug</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default" arch="x86_64">libpsm2-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
@@ -3401,7 +3291,7 @@
       <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>
       <packagereq type="default">parted-devel</packagereq>
-      <packagereq type="default">pcre-static</packagereq>
+      <packagereq type="default">pcre2-static</packagereq>
       <packagereq type="default">pcsc-lite-devel</packagereq>
       <packagereq type="default">perl-AnyEvent</packagereq>
       <packagereq type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -3682,7 +3572,6 @@
       <packagereq type="default">sblim-cmpi-devel</packagereq>
       <packagereq type="default">sblim-sfcc-devel</packagereq>
       <packagereq type="default">sdl12-compat-devel</packagereq>
-      <packagereq type="default">sendmail-milter-devel</packagereq>
       <packagereq type="default">sg3_utils-devel</packagereq>
       <packagereq type="default">shadow-utils-subid-devel</packagereq>
       <packagereq type="default">sharutils</packagereq>
@@ -3799,6 +3688,7 @@
       <packagereq type="default">libcpuid-devel</packagereq>
       <packagereq type="default">flatpak-rpm-macros</packagereq>
       <packagereq type="default">flatpak-runtime-config</packagereq>
+      <packagereq type="default">gnome-desktop-testing</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 3109db8..4e4f7a0 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -42,6 +42,7 @@
       <packagereq variant="AppStream">iptables-devel</packagereq>
       <packagereq variant="AppStream">libacl-devel</packagereq>
       <packagereq variant="AppStream">libaio-devel</packagereq>
+      <packagereq variant="AppStream">libarchive-devel</packagereq>
       <packagereq variant="AppStream">libattr-devel</packagereq>
       <packagereq variant="AppStream">libblkid-devel</packagereq>
       <packagereq variant="AppStream">libcap-devel</packagereq>
@@ -3155,7 +3156,6 @@
       <packagereq type="default">libadwaita-devel</packagereq>
       <packagereq type="default">libao-devel</packagereq>
       <packagereq type="default">libappstream-glib-devel</packagereq>
-      <packagereq type="default">libarchive-devel</packagereq>
       <packagereq type="default">libassuan-devel</packagereq>
       <packagereq type="default">libasyncns-devel</packagereq>
       <packagereq type="default">libatasmart-devel</packagereq>