update comps

comps/AppStream-aarch64.xml

@@ -116,16 +116,6 @@
       <packagereq type="mandatory">libreport-plugin-bugzilla</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>backup-client</id>
-    <name>Backup Client</name>
-    <description>Client tools for connecting to a backup server and doing backups.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>base</id>
     <name>Base</name>
@@ -145,24 +135,6 @@
       <packagereq type="default">wget</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <name>base-x</name>
-    <description>Local X.org display server</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq type="mandatory">plymouth-system-theme</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>conflicts-appstream</id>
     <name>Conflicts AppStream</name>
@@ -422,7 +394,6 @@
       <packagereq type="mandatory">gnome-disk-utility</packagereq>
       <packagereq type="mandatory">gnome-font-viewer</packagereq>
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
@@ -431,8 +402,6 @@
       <packagereq type="mandatory">gnome-shell-extension-background-logo</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
-      <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
       <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
@@ -446,6 +415,7 @@
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
+      <packagereq type="mandatory">ptyxis</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
@@ -616,7 +586,6 @@
     <packagelist>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">postfix</packagereq>
-      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">cyrus-imapd</packagereq>
       <packagereq type="optional">dovecot-pigeonhole</packagereq>
       <packagereq type="optional">postfix-cdb</packagereq>
@@ -1061,7 +1030,6 @@
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">aide</packagereq>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">freerdp</packagereq>
@@ -1485,7 +1453,6 @@
       <packagereq type="mandatory">qt6-qtdeclarative</packagereq>
       <packagereq type="mandatory">setroubleshoot</packagereq>
       <packagereq type="mandatory">telnet</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq type="default">bash-color-prompt</packagereq>
     </packagelist>
   </group>
@@ -1519,7 +1486,6 @@
     <description>Core system components.</description>
     <display_order>10</display_order>
     <grouplist>
-      <groupid>backup-client</groupid>
       <groupid>console-internet</groupid>
       <groupid>debugging</groupid>
       <groupid>hardware-monitoring</groupid>
@@ -1538,7 +1504,6 @@
     <description>Desktops and thin clients.</description>
     <display_order>70</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
@@ -1562,7 +1527,6 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>container-management</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>

comps/AppStream-ppc64le.xml

@@ -123,7 +123,6 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">rear</packagereq>
     </packagelist>
   </group>
@@ -149,24 +148,6 @@
       <packagereq type="default">wget</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <name>base-x</name>
-    <description>Local X.org display server</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq type="mandatory">plymouth-system-theme</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>conflicts-appstream</id>
     <name>Conflicts AppStream</name>
@@ -437,7 +418,6 @@
       <packagereq type="mandatory">gnome-disk-utility</packagereq>
       <packagereq type="mandatory">gnome-font-viewer</packagereq>
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
@@ -446,8 +426,6 @@
       <packagereq type="mandatory">gnome-shell-extension-background-logo</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
-      <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
       <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
@@ -462,6 +440,7 @@
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
+      <packagereq type="mandatory">ptyxis</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
       <packagereq type="mandatory">snapshot</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
@@ -629,7 +608,6 @@
     <packagelist>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">postfix</packagereq>
-      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">cyrus-imapd</packagereq>
       <packagereq type="optional">dovecot-pigeonhole</packagereq>
       <packagereq type="optional">postfix-cdb</packagereq>
@@ -1068,7 +1046,6 @@
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">aide</packagereq>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">freerdp</packagereq>
@@ -1463,7 +1440,6 @@
       <packagereq type="mandatory">qt6-qtdeclarative</packagereq>
       <packagereq type="mandatory">setroubleshoot</packagereq>
       <packagereq type="mandatory">telnet</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq type="default">bash-color-prompt</packagereq>
     </packagelist>
   </group>
@@ -1516,7 +1492,6 @@
     <description>Desktops and thin clients.</description>
     <display_order>70</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
@@ -1541,7 +1516,6 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>container-management</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>
@@ -1612,7 +1586,6 @@
     <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
     <display_order>4</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>

comps/AppStream-s390x.xml

@@ -125,7 +125,6 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">rear</packagereq>
     </packagelist>
   </group>
@@ -154,24 +153,6 @@
       <packagereq type="optional">s390utils-chreipl-fcp-mpath</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <name>base-x</name>
-    <description>Local X.org display server</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq type="mandatory">plymouth-system-theme</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>conflicts-appstream</id>
     <name>Conflicts AppStream</name>
@@ -427,7 +408,6 @@
       <packagereq type="mandatory">gnome-disk-utility</packagereq>
       <packagereq type="mandatory">gnome-font-viewer</packagereq>
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
@@ -436,8 +416,6 @@
       <packagereq type="mandatory">gnome-shell-extension-background-logo</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
-      <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
       <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
@@ -451,6 +429,7 @@
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
+      <packagereq type="mandatory">ptyxis</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
@@ -581,7 +560,6 @@
     <packagelist>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">postfix</packagereq>
-      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">cyrus-imapd</packagereq>
       <packagereq type="optional">dovecot-pigeonhole</packagereq>
       <packagereq type="optional">postfix-cdb</packagereq>
@@ -994,7 +972,6 @@
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">aide</packagereq>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">freerdp</packagereq>
@@ -1419,7 +1396,6 @@
       <packagereq type="mandatory">qt6-qtdeclarative</packagereq>
       <packagereq type="mandatory">setroubleshoot</packagereq>
       <packagereq type="mandatory">telnet</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq type="default">bash-color-prompt</packagereq>
     </packagelist>
   </group>
@@ -1471,7 +1447,6 @@
     <description>Desktops and thin clients.</description>
     <display_order>70</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
@@ -1494,7 +1469,6 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>container-management</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>

comps/AppStream-x86_64.xml

@@ -123,7 +123,6 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">rear</packagereq>
     </packagelist>
   </group>
@@ -147,24 +146,6 @@
       <packagereq type="default">wget</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <name>base-x</name>
-    <description>Local X.org display server</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq type="mandatory">plymouth-system-theme</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>conflicts-appstream</id>
     <name>Conflicts AppStream</name>
@@ -436,7 +417,6 @@
       <packagereq type="mandatory">gnome-disk-utility</packagereq>
       <packagereq type="mandatory">gnome-font-viewer</packagereq>
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
@@ -445,8 +425,6 @@
       <packagereq type="mandatory">gnome-shell-extension-background-logo</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
-      <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
       <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
@@ -461,6 +439,7 @@
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
+      <packagereq type="mandatory">ptyxis</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
       <packagereq type="mandatory">snapshot</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
@@ -632,7 +611,6 @@
     <packagelist>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">postfix</packagereq>
-      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">cyrus-imapd</packagereq>
       <packagereq type="optional">dovecot-pigeonhole</packagereq>
       <packagereq type="optional">postfix-cdb</packagereq>
@@ -1094,7 +1072,6 @@
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">aide</packagereq>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">freerdp</packagereq>
@@ -1524,7 +1501,6 @@
       <packagereq type="mandatory">setroubleshoot</packagereq>
       <packagereq type="mandatory">telnet</packagereq>
       <packagereq type="mandatory">thermald</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq type="default">bash-color-prompt</packagereq>
     </packagelist>
   </group>
@@ -1577,7 +1553,6 @@
     <description>Desktops and thin clients.</description>
     <display_order>70</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
@@ -1602,7 +1577,6 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>container-management</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>
@@ -1694,7 +1668,6 @@
     <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
     <display_order>4</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>

comps/BaseOS-aarch64.xml

@@ -317,7 +317,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>

comps/BaseOS-ppc64le.xml

@@ -318,7 +318,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>

comps/BaseOS-s390x.xml

@@ -311,7 +311,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>

comps/BaseOS-x86_64.xml

@@ -329,7 +329,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>

comps/CRB-aarch64.xml

@@ -158,7 +158,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -513,12 +512,12 @@
       <packagereq type="default">libxdp-static</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
       <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">libzmf-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lmdb</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
       <packagereq type="default">lua-devel</packagereq>
@@ -532,7 +531,6 @@
       <packagereq type="default">mariadb-test</packagereq>
       <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">mecab-devel</packagereq>
-      <packagereq type="default">memkind-devel</packagereq>
       <packagereq type="default">mesa-libGLES-devel</packagereq>
       <packagereq type="default">mesa-libOSMesa-devel</packagereq>
       <packagereq type="default">mesa-libgbm-devel</packagereq>
@@ -599,8 +597,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -1043,6 +1039,7 @@
       <packagereq type="default">varnish-devel</packagereq>
       <packagereq type="default">volume_key-devel</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">wavpack-devel</packagereq>
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
@@ -1073,12 +1070,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>

comps/CRB-ppc64le.xml

@@ -158,7 +158,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -510,12 +509,12 @@
       <packagereq type="default">libxdp-static</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
       <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">libzmf-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lmdb</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
       <packagereq type="default">lua-devel</packagereq>
@@ -528,7 +527,6 @@
       <packagereq type="default">mariadb-test</packagereq>
       <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">mecab-devel</packagereq>
-      <packagereq type="default">memkind-devel</packagereq>
       <packagereq type="default">mesa-libGLES-devel</packagereq>
       <packagereq type="default">mesa-libOSMesa-devel</packagereq>
       <packagereq type="default">mesa-libgbm-devel</packagereq>
@@ -595,8 +593,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -1032,6 +1028,7 @@
       <packagereq type="default">varnish-devel</packagereq>
       <packagereq type="default">volume_key-devel</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">wavpack-devel</packagereq>
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
@@ -1062,12 +1059,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>

comps/CRB-s390x.xml

@@ -154,7 +154,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -498,7 +497,6 @@
       <packagereq type="default">libxdp-static</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
       <packagereq type="default">libzdnn-static</packagereq>
       <packagereq type="default">libzfcphbaapi-devel</packagereq>
@@ -507,6 +505,7 @@
       <packagereq type="default">libzpc-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lmdb</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
       <packagereq type="default">lua-devel</packagereq>
@@ -586,8 +585,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -1028,6 +1025,7 @@
       <packagereq type="default">varnish-devel</packagereq>
       <packagereq type="default">volume_key-devel</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">wavpack-devel</packagereq>
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
@@ -1058,12 +1056,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>

comps/CRB-x86_64.xml

@@ -161,7 +161,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -519,12 +518,12 @@
       <packagereq type="default">libxdp-static</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
       <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">libzmf-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lmdb</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
       <packagereq type="default">lua-devel</packagereq>
@@ -538,7 +537,6 @@
       <packagereq type="default">mariadb-test</packagereq>
       <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">mecab-devel</packagereq>
-      <packagereq type="default">memkind-devel</packagereq>
       <packagereq type="default">mesa-libGLES-devel</packagereq>
       <packagereq type="default">mesa-libOSMesa-devel</packagereq>
       <packagereq type="default">mesa-libgbm-devel</packagereq>
@@ -636,8 +634,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -1085,6 +1081,7 @@
       <packagereq type="default">virt-v2v-man-pages-uk</packagereq>
       <packagereq type="default">volume_key-devel</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">wavpack-devel</packagereq>
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
@@ -1115,12 +1112,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>