From a6fb91275cb8758ad6aab5f94f71dcd35f184d42 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Tue, 17 May 2022 14:04:28 -0700
Subject: [PATCH] Sync with RHEL 9.0 and CentOS Stream 9

* Change Red Hat Enterprise Linux references to Rocky
* Ensure LH is synced with stream
* Try to match RHEL 9 comps with our own as we were in 9.1 territory
---
 comps-rocky-9-lh.xml    | 10 +++----
 comps-rocky-9-lh.xml.in | 10 +++----
 comps-rocky-9.0.xml     | 59 +++++------------------------------------
 comps-rocky-9.0.xml.in  | 59 +++++------------------------------------
 4 files changed, 24 insertions(+), 114 deletions(-)

diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index 00df36b..91d62b0 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -863,7 +863,7 @@
   <group>
     <id>platform-devel</id>
     <name>Platform Development</name>
-    <description>Recommended development headers and libraries for developing applications to run on Red Hat Enterprise Linux.</description>
+    <description>Recommended development headers and libraries for developing applications to run on Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1047,7 +1047,7 @@
   <group>
     <id>standard</id>
     <name>Standard</name>
-    <description>The standard installation of Red Hat Enterprise Linux.</description>
+    <description>The standard installation of Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1154,7 +1154,7 @@
   <group>
     <id>base</id>
     <name>Base</name>
-    <description>The standard installation of Red Hat Enterprise Linux.</description>
+    <description>The standard installation of Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1846,7 +1846,7 @@
   <group>
     <id>remote-system-management</id>
     <name>Remote Management for Linux</name>
-    <description>Remote management interface for Red Hat Enterprise Linux.</description>
+    <description>Remote management interface for Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2086,7 +2086,7 @@
   <group variant="AppStream">
     <id>java-platform</id>
     <name>Java Platform</name>
-    <description>Java support for the Red Hat Enterprise Linux Server and Desktop Platforms.</description>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 6259891..159a96a 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -862,7 +862,7 @@
   <group>
     <id>platform-devel</id>
     <_name>Platform Development</_name>
-    <_description>Recommended development headers and libraries for developing applications to run on Red Hat Enterprise Linux.</_description>
+    <_description>Recommended development headers and libraries for developing applications to run on Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1046,7 +1046,7 @@
   <group>
     <id>standard</id>
     <_name>Standard</_name>
-    <_description>The standard installation of Red Hat Enterprise Linux.</_description>
+    <_description>The standard installation of Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1153,7 +1153,7 @@
   <group>
     <id>base</id>
     <_name>Base</_name>
-    <_description>The standard installation of Red Hat Enterprise Linux.</_description>
+    <_description>The standard installation of Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1845,7 +1845,7 @@
   <group>
     <id>remote-system-management</id>
     <_name>Remote Management for Linux</_name>
-    <_description>Remote management interface for Red Hat Enterprise Linux.</_description>
+    <_description>Remote management interface for Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2085,7 +2085,7 @@
   <group variant="AppStream">
     <id>java-platform</id>
     <_name>Java Platform</_name>
-    <_description>Java support for the Red Hat Enterprise Linux Server and Desktop Platforms.</_description>
+    <_description>Java support for the Rocky Linux Server and Desktop Platforms.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
diff --git a/comps-rocky-9.0.xml b/comps-rocky-9.0.xml
index 059dc01..7e59b8c 100644
--- a/comps-rocky-9.0.xml
+++ b/comps-rocky-9.0.xml
@@ -96,7 +96,7 @@
       <packagereq variant="AppStream">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream">libcanberra-devel</packagereq>
       <packagereq variant="AppStream">libdrm-devel</packagereq>
-      <packagereq variant="AppStream">libva-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">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>
@@ -863,7 +863,7 @@
   <group>
     <id>platform-devel</id>
     <name>Platform Development</name>
-    <description>Recommended development headers and libraries for developing applications to run on Red Hat Enterprise Linux.</description>
+    <description>Recommended development headers and libraries for developing applications to run on Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1047,7 +1047,7 @@
   <group>
     <id>standard</id>
     <name>Standard</name>
-    <description>The standard installation of Red Hat Enterprise Linux.</description>
+    <description>The standard installation of Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1154,7 +1154,7 @@
   <group>
     <id>base</id>
     <name>Base</name>
-    <description>The standard installation of Red Hat Enterprise Linux.</description>
+    <description>The standard installation of Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1846,7 +1846,7 @@
   <group>
     <id>remote-system-management</id>
     <name>Remote Management for Linux</name>
-    <description>Remote management interface for Red Hat Enterprise Linux.</description>
+    <description>Remote management interface for Rocky Linux.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2086,7 +2086,7 @@
   <group variant="AppStream">
     <id>java-platform</id>
     <name>Java Platform</name>
-    <description>Java support for the Red Hat Enterprise Linux Server and Desktop Platforms.</description>
+    <description>Java support for the Rocky Linux Server and Desktop Platforms.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2847,9 +2847,7 @@
       <packagereq type="default" arch="x86_64">accel-config-devel</packagereq>
       <packagereq type="default">accountsservice-devel</packagereq>
       <packagereq type="default">adwaita-icon-theme-devel</packagereq>
-      <packagereq type="default">anaconda-widgets-devel</packagereq>
       <packagereq type="default">ant-junit</packagereq>
-      <packagereq type="default">anthy-unicode-devel</packagereq>
       <packagereq type="default">antlr-C++</packagereq>
       <packagereq type="default">antlr-tool</packagereq>
       <packagereq type="default">apache-commons-beanutils</packagereq>
@@ -2933,7 +2931,6 @@
       <packagereq type="default">docbook-style-dsssl</packagereq>
       <packagereq type="default">docbook-utils</packagereq>
       <packagereq type="default">dotconf-devel</packagereq>
-      <packagereq type="default">double-conversion-devel</packagereq>
       <packagereq type="default">dovecot-devel</packagereq>
       <packagereq type="default">doxygen</packagereq>
       <packagereq type="default">doxygen-doxywizard</packagereq>
@@ -2982,7 +2979,6 @@
       <packagereq type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq type="default">gdm-devel</packagereq>
-      <packagereq type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">gegl04-devel</packagereq>
       <packagereq type="default">geoclue2-demos</packagereq>
       <packagereq type="default">geoclue2-devel</packagereq>
@@ -3103,7 +3099,6 @@
       <packagereq type="default">libdb-sql</packagereq>
       <packagereq type="default">libdb-sql-devel</packagereq>
       <packagereq type="default">libdecor-devel</packagereq>
-      <packagereq type="default">libdhash-devel</packagereq>
       <packagereq type="default">libdnf-devel</packagereq>
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
@@ -3111,14 +3106,12 @@
       <packagereq type="default">libEMF</packagereq>
       <packagereq type="default">libEMF-devel</packagereq>
       <packagereq type="default">libeot</packagereq>
-      <packagereq type="default">libestr-devel</packagereq>
       <packagereq type="default">libetonyek-devel</packagereq>
       <packagereq type="default">libevdev-devel</packagereq>
       <packagereq type="default">libexif-devel</packagereq>
       <packagereq type="default">libfabric-devel</packagereq>
       <packagereq type="default">libfdisk-devel</packagereq>
       <packagereq type="default">libfdt-devel</packagereq>
-      <packagereq type="default">libfdt-static</packagereq>
       <packagereq type="default">libfido2-devel</packagereq>
       <packagereq type="default">libfontenc-devel</packagereq>
       <packagereq type="default">libgee-devel</packagereq>
@@ -3266,7 +3259,6 @@
       <packagereq type="default">libwacom-devel</packagereq>
       <packagereq type="default">libwbclient-devel</packagereq>
       <packagereq type="default">libwnck3-devel</packagereq>
-      <packagereq type="default">libwpe-devel</packagereq>
       <packagereq type="default">libwpd-devel</packagereq>
       <packagereq type="default">libwpd-doc</packagereq>
       <packagereq type="default">libwpg-devel</packagereq>
@@ -3283,7 +3275,6 @@
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
-      <packagereq type="default" arch="s390x">libzfcphbaapi-devel</packagereq>
       <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
@@ -3297,7 +3288,6 @@
       <packagereq type="default">mariadb-embedded-devel</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-test</packagereq>
-      <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">maven-archiver</packagereq>
       <packagereq type="default">maven-artifact-transfer</packagereq>
       <packagereq type="default">maven-common-artifact-filters</packagereq>
@@ -3394,7 +3384,6 @@
       <packagereq type="default">nautilus-devel</packagereq>
       <packagereq type="default">nbdkit-devel</packagereq>
       <packagereq type="default">nbdkit-example-plugins</packagereq>
-      <packagereq type="default">nbdkit-srpm-macros</packagereq>
       <packagereq type="default">ndctl-devel</packagereq>
       <packagereq type="default">nftables-devel</packagereq>
       <packagereq type="default">neon-devel</packagereq>
@@ -3407,38 +3396,16 @@
       <packagereq type="default">ninja-build</packagereq>
       <packagereq type="default">nispor-devel</packagereq>
       <packagereq type="default">npth-devel</packagereq>
-      <packagereq type="default">nmstate-devel</packagereq>
       <packagereq type="default">nss_hesiod</packagereq>
       <packagereq type="default">objectweb-asm</packagereq>
       <packagereq type="default">objenesis</packagereq>
       <packagereq type="default">ocaml</packagereq>
-      <packagereq type="default">ocaml-brlapi</packagereq>
-      <packagereq type="default">ocaml-calendar</packagereq>
-      <packagereq type="default">ocaml-calendar-devel</packagereq>
-      <packagereq type="default">ocaml-camomile</packagereq>
-      <packagereq type="default">ocaml-camomile-data</packagereq>
-      <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>
-      <packagereq type="default">ocaml-curses-devel</packagereq>
-      <packagereq type="default">ocaml-docs</packagereq>
-      <packagereq type="default">ocaml-dune</packagereq>
-      <packagereq type="default">ocaml-dune-devel</packagereq>
-      <packagereq type="default">ocaml-dune-doc</packagereq>
-      <packagereq type="default">ocaml-dune-emacs</packagereq>
       <packagereq type="default">ocaml-extlib</packagereq>
       <packagereq type="default">ocaml-extlib-devel</packagereq>
-      <packagereq type="default">ocaml-fileutils</packagereq>
-      <packagereq type="default">ocaml-fileutils-devel</packagereq>
       <packagereq type="default">ocaml-findlib</packagereq>
       <packagereq type="default">ocaml-findlib-devel</packagereq>
-      <packagereq type="default">ocaml-gettext</packagereq>
-      <packagereq type="default">ocaml-gettext-devel</packagereq>
       <packagereq type="default">ocaml-hivex</packagereq>
       <packagereq type="default">ocaml-hivex-devel</packagereq>
       <packagereq type="default">ocaml-labltk</packagereq>
@@ -3447,16 +3414,10 @@
       <packagereq type="default" arch="aarch64,s390x,x86_64">ocaml-libguestfs-devel</packagereq>
       <packagereq type="default">ocaml-libnbd</packagereq>
       <packagereq type="default">ocaml-libnbd-devel</packagereq>
-      <packagereq type="default">ocaml-libvirt</packagereq>
-      <packagereq type="default">ocaml-libvirt-devel</packagereq>
       <packagereq type="default">ocaml-ocamlbuild</packagereq>
       <packagereq type="default">ocaml-ocamlbuild-devel</packagereq>
-      <packagereq type="default">ocaml-ocamlbuild-doc</packagereq>
       <packagereq type="default">ocaml-ocamldoc</packagereq>
       <packagereq type="default">ocaml-runtime</packagereq>
-      <packagereq type="default">ocaml-source</packagereq>
-      <packagereq type="default">ocaml-xml-light</packagereq>
-      <packagereq type="default">ocaml-xml-light-devel</packagereq>
       <packagereq type="default">ocl-icd-devel</packagereq>
       <packagereq type="default">oniguruma-devel</packagereq>
       <packagereq type="default">openal-soft-devel</packagereq>
@@ -3488,7 +3449,6 @@
       <packagereq type="default">osgi-compendium</packagereq>
       <packagereq type="default">osgi-core</packagereq>
       <packagereq type="default">PackageKit-glib-devel</packagereq>
-      <packagereq type="default">pam_wrapper</packagereq>
       <packagereq type="default">pangomm-devel</packagereq>
       <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>
@@ -3661,7 +3621,6 @@
       <packagereq type="default">python-packaging-doc</packagereq>
       <packagereq type="default">python-sphinx-doc</packagereq>
       <packagereq type="default">python-sphinx_rtd_theme-doc</packagereq>
-      <packagereq type="default">python3-babeltrace</packagereq>
       <packagereq type="default">python3-Cython</packagereq>
       <packagereq type="default">emacs-cython-mode</packagereq>
       <packagereq type="default">python3-debug</packagereq>
@@ -3673,7 +3632,6 @@
       <packagereq type="default">python3-javapackages</packagereq>
       <packagereq type="default">python3-lesscpy</packagereq>
       <packagereq type="default">python3-libnmstate</packagereq>
-      <packagereq type="default">python3-libfdt</packagereq>
       <packagereq type="default">python3-libpfm</packagereq>
       <packagereq type="default">python3-markdown</packagereq>
       <packagereq type="default">python3-packaging</packagereq>
@@ -3697,6 +3655,7 @@
       <packagereq type="default">python3-sphinx_rtd_theme</packagereq>
       <packagereq type="default">python3-sphinx-theme-alabaster</packagereq>
       <packagereq type="default">python3-test</packagereq>
+      <packagereq type="default">python3-wcwidth</packagereq>
       <packagereq type="default">python3-wheel</packagereq>
       <packagereq type="default">python3-wheel-wheel</packagereq>
       <packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
@@ -3714,9 +3673,7 @@
       <packagereq type="default">quota-devel</packagereq>
       <packagereq type="default">raptor2-devel</packagereq>
       <packagereq type="default">rasqal-devel</packagereq>
-      <packagereq type="default">redhat-sb-certs</packagereq>
       <packagereq type="default">redland-devel</packagereq>
-      <packagereq type="default">rhc-devel</packagereq>
       <packagereq type="default">rpcgen</packagereq>
       <packagereq type="default">rpcsvc-proto-devel</packagereq>
       <packagereq type="default">rrdtool-devel</packagereq>
@@ -3785,7 +3742,6 @@
       <packagereq type="default">turbojpeg-devel</packagereq>
       <packagereq type="default">twolame-devel</packagereq>
       <packagereq type="default">uid_wrapper</packagereq>
-      <packagereq type="default">unbound-devel</packagereq>
       <packagereq type="default">unicode-ucd-unihan</packagereq>
       <packagereq type="default">unixODBC-devel</packagereq>
       <packagereq type="default">upower-devel</packagereq>
@@ -3805,7 +3761,6 @@
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
       <packagereq type="default">woff2-devel</packagereq>
-      <packagereq type="default">wpebackend-fdo-devel</packagereq>
       <packagereq type="default">Xaw3d-devel</packagereq>
       <packagereq type="default">xapian-core-devel</packagereq>
       <packagereq type="default">xbean</packagereq>
diff --git a/comps-rocky-9.0.xml.in b/comps-rocky-9.0.xml.in
index f386096..86ebe75 100644
--- a/comps-rocky-9.0.xml.in
+++ b/comps-rocky-9.0.xml.in
@@ -95,7 +95,7 @@
       <packagereq variant="AppStream">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream">libcanberra-devel</packagereq>
       <packagereq variant="AppStream">libdrm-devel</packagereq>
-      <packagereq variant="AppStream">libva-devel</packagereq>
+      <packagereq arch="x86_64" 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>
@@ -862,7 +862,7 @@
   <group>
     <id>platform-devel</id>
     <_name>Platform Development</_name>
-    <_description>Recommended development headers and libraries for developing applications to run on Red Hat Enterprise Linux.</_description>
+    <_description>Recommended development headers and libraries for developing applications to run on Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1046,7 +1046,7 @@
   <group>
     <id>standard</id>
     <_name>Standard</_name>
-    <_description>The standard installation of Red Hat Enterprise Linux.</_description>
+    <_description>The standard installation of Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1153,7 +1153,7 @@
   <group>
     <id>base</id>
     <_name>Base</_name>
-    <_description>The standard installation of Red Hat Enterprise Linux.</_description>
+    <_description>The standard installation of Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1845,7 +1845,7 @@
   <group>
     <id>remote-system-management</id>
     <_name>Remote Management for Linux</_name>
-    <_description>Remote management interface for Red Hat Enterprise Linux.</_description>
+    <_description>Remote management interface for Rocky Linux.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2085,7 +2085,7 @@
   <group variant="AppStream">
     <id>java-platform</id>
     <_name>Java Platform</_name>
-    <_description>Java support for the Red Hat Enterprise Linux Server and Desktop Platforms.</_description>
+    <_description>Java support for the Rocky Linux Server and Desktop Platforms.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2846,9 +2846,7 @@
       <packagereq type="default" arch="x86_64">accel-config-devel</packagereq>
       <packagereq type="default">accountsservice-devel</packagereq>
       <packagereq type="default">adwaita-icon-theme-devel</packagereq>
-      <packagereq type="default">anaconda-widgets-devel</packagereq>
       <packagereq type="default">ant-junit</packagereq>
-      <packagereq type="default">anthy-unicode-devel</packagereq>
       <packagereq type="default">antlr-C++</packagereq>
       <packagereq type="default">antlr-tool</packagereq>
       <packagereq type="default">apache-commons-beanutils</packagereq>
@@ -2932,7 +2930,6 @@
       <packagereq type="default">docbook-style-dsssl</packagereq>
       <packagereq type="default">docbook-utils</packagereq>
       <packagereq type="default">dotconf-devel</packagereq>
-      <packagereq type="default">double-conversion-devel</packagereq>
       <packagereq type="default">dovecot-devel</packagereq>
       <packagereq type="default">doxygen</packagereq>
       <packagereq type="default">doxygen-doxywizard</packagereq>
@@ -2981,7 +2978,6 @@
       <packagereq type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq type="default">gdm-devel</packagereq>
-      <packagereq type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">gegl04-devel</packagereq>
       <packagereq type="default">geoclue2-demos</packagereq>
       <packagereq type="default">geoclue2-devel</packagereq>
@@ -3102,7 +3098,6 @@
       <packagereq type="default">libdb-sql</packagereq>
       <packagereq type="default">libdb-sql-devel</packagereq>
       <packagereq type="default">libdecor-devel</packagereq>
-      <packagereq type="default">libdhash-devel</packagereq>
       <packagereq type="default">libdnf-devel</packagereq>
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
@@ -3110,14 +3105,12 @@
       <packagereq type="default">libEMF</packagereq>
       <packagereq type="default">libEMF-devel</packagereq>
       <packagereq type="default">libeot</packagereq>
-      <packagereq type="default">libestr-devel</packagereq>
       <packagereq type="default">libetonyek-devel</packagereq>
       <packagereq type="default">libevdev-devel</packagereq>
       <packagereq type="default">libexif-devel</packagereq>
       <packagereq type="default">libfabric-devel</packagereq>
       <packagereq type="default">libfdisk-devel</packagereq>
       <packagereq type="default">libfdt-devel</packagereq>
-      <packagereq type="default">libfdt-static</packagereq>
       <packagereq type="default">libfido2-devel</packagereq>
       <packagereq type="default">libfontenc-devel</packagereq>
       <packagereq type="default">libgee-devel</packagereq>
@@ -3265,7 +3258,6 @@
       <packagereq type="default">libwacom-devel</packagereq>
       <packagereq type="default">libwbclient-devel</packagereq>
       <packagereq type="default">libwnck3-devel</packagereq>
-      <packagereq type="default">libwpe-devel</packagereq>
       <packagereq type="default">libwpd-devel</packagereq>
       <packagereq type="default">libwpd-doc</packagereq>
       <packagereq type="default">libwpg-devel</packagereq>
@@ -3282,7 +3274,6 @@
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
-      <packagereq type="default" arch="s390x">libzfcphbaapi-devel</packagereq>
       <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
@@ -3296,7 +3287,6 @@
       <packagereq type="default">mariadb-embedded-devel</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-test</packagereq>
-      <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">maven-archiver</packagereq>
       <packagereq type="default">maven-artifact-transfer</packagereq>
       <packagereq type="default">maven-common-artifact-filters</packagereq>
@@ -3393,7 +3383,6 @@
       <packagereq type="default">nautilus-devel</packagereq>
       <packagereq type="default">nbdkit-devel</packagereq>
       <packagereq type="default">nbdkit-example-plugins</packagereq>
-      <packagereq type="default">nbdkit-srpm-macros</packagereq>
       <packagereq type="default">ndctl-devel</packagereq>
       <packagereq type="default">nftables-devel</packagereq>
       <packagereq type="default">neon-devel</packagereq>
@@ -3406,38 +3395,16 @@
       <packagereq type="default">ninja-build</packagereq>
       <packagereq type="default">nispor-devel</packagereq>
       <packagereq type="default">npth-devel</packagereq>
-      <packagereq type="default">nmstate-devel</packagereq>
       <packagereq type="default">nss_hesiod</packagereq>
       <packagereq type="default">objectweb-asm</packagereq>
       <packagereq type="default">objenesis</packagereq>
       <packagereq type="default">ocaml</packagereq>
-      <packagereq type="default">ocaml-brlapi</packagereq>
-      <packagereq type="default">ocaml-calendar</packagereq>
-      <packagereq type="default">ocaml-calendar-devel</packagereq>
-      <packagereq type="default">ocaml-camomile</packagereq>
-      <packagereq type="default">ocaml-camomile-data</packagereq>
-      <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>
-      <packagereq type="default">ocaml-curses-devel</packagereq>
-      <packagereq type="default">ocaml-docs</packagereq>
-      <packagereq type="default">ocaml-dune</packagereq>
-      <packagereq type="default">ocaml-dune-devel</packagereq>
-      <packagereq type="default">ocaml-dune-doc</packagereq>
-      <packagereq type="default">ocaml-dune-emacs</packagereq>
       <packagereq type="default">ocaml-extlib</packagereq>
       <packagereq type="default">ocaml-extlib-devel</packagereq>
-      <packagereq type="default">ocaml-fileutils</packagereq>
-      <packagereq type="default">ocaml-fileutils-devel</packagereq>
       <packagereq type="default">ocaml-findlib</packagereq>
       <packagereq type="default">ocaml-findlib-devel</packagereq>
-      <packagereq type="default">ocaml-gettext</packagereq>
-      <packagereq type="default">ocaml-gettext-devel</packagereq>
       <packagereq type="default">ocaml-hivex</packagereq>
       <packagereq type="default">ocaml-hivex-devel</packagereq>
       <packagereq type="default">ocaml-labltk</packagereq>
@@ -3446,16 +3413,10 @@
       <packagereq type="default" arch="aarch64,s390x,x86_64">ocaml-libguestfs-devel</packagereq>
       <packagereq type="default">ocaml-libnbd</packagereq>
       <packagereq type="default">ocaml-libnbd-devel</packagereq>
-      <packagereq type="default">ocaml-libvirt</packagereq>
-      <packagereq type="default">ocaml-libvirt-devel</packagereq>
       <packagereq type="default">ocaml-ocamlbuild</packagereq>
       <packagereq type="default">ocaml-ocamlbuild-devel</packagereq>
-      <packagereq type="default">ocaml-ocamlbuild-doc</packagereq>
       <packagereq type="default">ocaml-ocamldoc</packagereq>
       <packagereq type="default">ocaml-runtime</packagereq>
-      <packagereq type="default">ocaml-source</packagereq>
-      <packagereq type="default">ocaml-xml-light</packagereq>
-      <packagereq type="default">ocaml-xml-light-devel</packagereq>
       <packagereq type="default">ocl-icd-devel</packagereq>
       <packagereq type="default">oniguruma-devel</packagereq>
       <packagereq type="default">openal-soft-devel</packagereq>
@@ -3487,7 +3448,6 @@
       <packagereq type="default">osgi-compendium</packagereq>
       <packagereq type="default">osgi-core</packagereq>
       <packagereq type="default">PackageKit-glib-devel</packagereq>
-      <packagereq type="default">pam_wrapper</packagereq>
       <packagereq type="default">pangomm-devel</packagereq>
       <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>
@@ -3660,7 +3620,6 @@
       <packagereq type="default">python-packaging-doc</packagereq>
       <packagereq type="default">python-sphinx-doc</packagereq>
       <packagereq type="default">python-sphinx_rtd_theme-doc</packagereq>
-      <packagereq type="default">python3-babeltrace</packagereq>
       <packagereq type="default">python3-Cython</packagereq>
       <packagereq type="default">emacs-cython-mode</packagereq>
       <packagereq type="default">python3-debug</packagereq>
@@ -3672,7 +3631,6 @@
       <packagereq type="default">python3-javapackages</packagereq>
       <packagereq type="default">python3-lesscpy</packagereq>
       <packagereq type="default">python3-libnmstate</packagereq>
-      <packagereq type="default">python3-libfdt</packagereq>
       <packagereq type="default">python3-libpfm</packagereq>
       <packagereq type="default">python3-markdown</packagereq>
       <packagereq type="default">python3-packaging</packagereq>
@@ -3696,6 +3654,7 @@
       <packagereq type="default">python3-sphinx_rtd_theme</packagereq>
       <packagereq type="default">python3-sphinx-theme-alabaster</packagereq>
       <packagereq type="default">python3-test</packagereq>
+      <packagereq type="default">python3-wcwidth</packagereq>
       <packagereq type="default">python3-wheel</packagereq>
       <packagereq type="default">python3-wheel-wheel</packagereq>
       <packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
@@ -3713,9 +3672,7 @@
       <packagereq type="default">quota-devel</packagereq>
       <packagereq type="default">raptor2-devel</packagereq>
       <packagereq type="default">rasqal-devel</packagereq>
-      <packagereq type="default">redhat-sb-certs</packagereq>
       <packagereq type="default">redland-devel</packagereq>
-      <packagereq type="default">rhc-devel</packagereq>
       <packagereq type="default">rpcgen</packagereq>
       <packagereq type="default">rpcsvc-proto-devel</packagereq>
       <packagereq type="default">rrdtool-devel</packagereq>
@@ -3784,7 +3741,6 @@
       <packagereq type="default">turbojpeg-devel</packagereq>
       <packagereq type="default">twolame-devel</packagereq>
       <packagereq type="default">uid_wrapper</packagereq>
-      <packagereq type="default">unbound-devel</packagereq>
       <packagereq type="default">unicode-ucd-unihan</packagereq>
       <packagereq type="default">unixODBC-devel</packagereq>
       <packagereq type="default">upower-devel</packagereq>
@@ -3804,7 +3760,6 @@
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
       <packagereq type="default">woff2-devel</packagereq>
-      <packagereq type="default">wpebackend-fdo-devel</packagereq>
       <packagereq type="default">Xaw3d-devel</packagereq>
       <packagereq type="default">xapian-core-devel</packagereq>
       <packagereq type="default">xbean</packagereq>