diff --git a/comps-centos-8-stream.xml b/comps-centos-8-stream.xml
index 0f73b52..a1c5a48 100644
--- a/comps-centos-8-stream.xml
+++ b/comps-centos-8-stream.xml
@@ -535,7 +535,6 @@
       <packagereq variant="BaseOS" type="mandatory">procps-ng</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rootfiles</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rpm</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">rng-tools</packagereq>
       <packagereq variant="AppStream" type="mandatory">rsyslog</packagereq>
       <packagereq variant="BaseOS" type="mandatory">selinux-policy-targeted</packagereq>
       <packagereq variant="BaseOS" type="mandatory">setup</packagereq>
@@ -2136,7 +2135,6 @@
       <packagereq variant="AppStream" type="optional">freeradius</packagereq>
       <packagereq variant="AppStream" type="optional">idn2</packagereq>
       <packagereq variant="AppStream" type="optional">frr</packagereq>
-      <packagereq variant="AppStream" type="optional">frr-contrib</packagereq>
       <packagereq variant="AppStream" type="optional">libreswan</packagereq>
       <packagereq variant="AppStream" type="optional">radvd</packagereq>
       <packagereq variant="AppStream" type="optional">rsyslog-gnutls</packagereq>
@@ -2410,7 +2408,6 @@
       <packagereq variant="AppStream" type="default">perl-PCP-PMDA</packagereq>
       <packagereq variant="AppStream" type="default">python3-pcp</packagereq>
       <packagereq variant="AppStream" type="default">powertop</packagereq>
-      <packagereq variant="AppStream" type="optional">pcp-manager</packagereq>
       <packagereq variant="AppStream" type="optional">pcp-pmda-docker</packagereq>
       <packagereq variant="AppStream" type="optional">fio</packagereq>
       <packagereq variant="AppStream" type="optional">tuned-utils</packagereq>
@@ -2521,6 +2518,7 @@
       <packagereq variant="AppStream">qt5-qtx11extras-devel</packagereq>
       <packagereq variant="AppStream">qt5-qtxmlpatterns-devel</packagereq>
       <packagereq variant="AppStream">qt5-qtserialbus</packagereq>
+      <packagereq variant="AppStream">python3-pyodbc</packagereq>
       <packagereq variant="AppStream" arch="x86_64,ppc64le,aarch64">qt5-qtwayland</packagereq>
       <packagereq variant="AppStream">xorg-x11-docs</packagereq>
       <packagereq variant="AppStream" type="optional">spirv-tools</packagereq>
@@ -3044,6 +3042,7 @@
       <packagereq variant="BaseOS" type="mandatory">iptstate</packagereq>
       <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64">irqbalance</packagereq>
       <packagereq variant="BaseOS" type="mandatory">kpatch</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">kpatch-dnf</packagereq>
       <packagereq variant="BaseOS" type="mandatory">logrotate</packagereq>
       <packagereq variant="BaseOS" type="mandatory">lsof</packagereq>
       <packagereq variant="BaseOS" type="mandatory" arch="x86_64">mcelog</packagereq>
@@ -3087,7 +3086,6 @@
       <packagereq variant="AppStream" type="default">pinfo</packagereq>
       <packagereq variant="AppStream" type="default">plymouth</packagereq>
       <packagereq variant="BaseOS" type="default">realmd</packagereq>
-      <packagereq variant="BaseOS" type="default">rng-tools</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils-cmsfs-fuse</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils-cpacfstatsd</packagereq>
@@ -3223,6 +3221,7 @@
       <packagereq variant="BaseOS" type="mandatory">iptstate</packagereq>
       <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64">irqbalance</packagereq>
       <packagereq variant="BaseOS" type="mandatory">kpatch</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">kpatch-dnf</packagereq>
       <packagereq variant="BaseOS" type="mandatory">logrotate</packagereq>
       <packagereq variant="BaseOS" type="mandatory">lsof</packagereq>
       <packagereq variant="BaseOS" type="mandatory" arch="x86_64">mcelog</packagereq>
@@ -3266,7 +3265,6 @@
       <packagereq variant="AppStream" type="default">pinfo</packagereq>
       <packagereq variant="AppStream" type="default">plymouth</packagereq>
       <packagereq variant="BaseOS" type="default">realmd</packagereq>
-      <packagereq variant="BaseOS" type="default">rng-tools</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils-cmsfs-fuse</packagereq>
       <packagereq variant="AppStream" type="default" arch="s390x">s390utils-cpacfstatsd</packagereq>
@@ -4038,7 +4036,6 @@
       <packagereq variant="BaseOS">realmd</packagereq>
       <packagereq variant="BaseOS" type="mandatory">centos-stream-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">centos-stream-release-eula</packagereq>
-      <packagereq variant="BaseOS">rng-tools</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
@@ -4938,7 +4935,7 @@
       <packagereq type="optional">vim-perl-support</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream" arch="x86_64">
+  <group variant="AppStream" arch="ppc64le,x86_64">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
     <name xml:lang="as">কাৰ্যালয় গোট আৰু কাৰ্য্যক্ষমতা</name>
@@ -5504,7 +5501,7 @@
       <packagereq type="default">icedtea-web</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream" arch="aarch64,x86_64,ppc64le">
+  <group variant="AppStream">
     <id>internet-applications</id>
     <name>Internet Applications</name>
     <name xml:lang="as">ইন্টাৰনেট এপ্লিকেচনসমূহ</name>
@@ -5763,7 +5760,7 @@
       <packagereq>rubygem-rest-client</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream" arch="x86_64,ppc64le,aarch64">
+  <group variant="AppStream">
     <id>guest-desktop-agents</id>
     <name>Guest Desktop Agents</name>
     <name xml:lang="as">অতিথি ডেস্কটপ সহায়কসমূহ</name>
@@ -6297,6 +6294,7 @@
       <packagereq variant="AppStream" type="default">asciidoc</packagereq>
       <packagereq variant="AppStream" type="default">ctags</packagereq>
       <packagereq variant="AppStream" type="default">diffstat</packagereq>
+      <packagereq variant="BaseOS" type="default">elfutils-libelf-devel</packagereq>
       <packagereq variant="AppStream" type="default">git</packagereq>
       <packagereq variant="AppStream" type="default">intltool</packagereq>
       <packagereq variant="AppStream" type="default" basearchonly="true">ltrace</packagereq>
@@ -6439,7 +6437,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-2.1</packagereq>
-      <packagereq type="optional" arch="x86_64">dotnet-sdk-3.0</packagereq>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-3.1</packagereq>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-5.0</packagereq>
     </packagelist>
@@ -7980,9 +7977,6 @@
       <packagereq type="default">device-mapper-devel</packagereq>
       <packagereq type="default">device-mapper-event-devel</packagereq>
       <packagereq type="default">device-mapper-multipath-devel</packagereq>
-      <packagereq type="default">djvulibre</packagereq>
-      <packagereq type="default">djvulibre-devel</packagereq>
-      <packagereq type="default">djvulibre-libs</packagereq>
       <packagereq type="default">docbook2X</packagereq>
       <packagereq type="default">docbook5-schemas</packagereq>
       <packagereq type="default">docbook-style-dsssl</packagereq>
@@ -7995,10 +7989,10 @@
       <packagereq type="default">drpm-devel</packagereq>
       <packagereq type="default">dtc</packagereq>
       <packagereq type="default">dwarves</packagereq>
-      <packagereq type="default">dyninst-devel</packagereq>
-      <packagereq type="default">dyninst-doc</packagereq>
-      <packagereq type="default">dyninst-static</packagereq>
-      <packagereq type="default">dyninst-testsuite</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">dyninst-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">dyninst-doc</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">dyninst-static</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">dyninst-testsuite</packagereq>
       <packagereq type="default">easymock</packagereq>
       <packagereq type="default">eglexternalplatform-devel</packagereq>
       <packagereq type="default">eigen3-devel</packagereq>
@@ -8037,11 +8031,11 @@
       <packagereq type="default">fuse-sshfs</packagereq>
       <packagereq type="default">gamin-devel</packagereq>
       <packagereq type="default">gcc-plugin-devel</packagereq>
-      <packagereq type="default">gcc-toolset-9-dyninst-devel</packagereq>
-      <packagereq type="default">gcc-toolset-9-dyninst-doc</packagereq>
-      <packagereq type="default">gcc-toolset-9-dyninst-static</packagereq>
-      <packagereq type="default">gcc-toolset-9-dyninst-testsuite</packagereq>
-      <packagereq type="default">gcc-toolset-9-gcc-plugin-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gcc-toolset-9-dyninst-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gcc-toolset-9-dyninst-doc</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gcc-toolset-9-dyninst-static</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gcc-toolset-9-dyninst-testsuite</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gcc-toolset-9-gcc-plugin-devel</packagereq>
       <packagereq type="default">gc-devel</packagereq>
       <packagereq type="default">GConf2-devel</packagereq>
       <packagereq type="default">gdk-pixbuf2-xlib</packagereq>
@@ -8133,6 +8127,7 @@
       <packagereq type="default">ilmbase-devel</packagereq>
       <packagereq type="default">ima-evm-utils-devel</packagereq>
       <packagereq type="default">imake</packagereq>
+      <packagereq type="default" arch="x86_64">intel-cmt-cat-devel</packagereq>
       <packagereq type="default">iproute-devel</packagereq>
       <packagereq type="default">ipset-devel</packagereq>
       <packagereq type="default">irssi-devel</packagereq>
@@ -8155,7 +8150,7 @@
       <packagereq type="default">junit</packagereq>
       <packagereq type="default">jvnet-parent</packagereq>
       <packagereq type="default">jzlib</packagereq>
-      <packagereq type="default">kernel-tools-libs-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">kernel-tools-libs-devel</packagereq>
       <packagereq type="default">keybinder3-devel</packagereq>
       <packagereq type="default">keybinder3-doc</packagereq>
       <packagereq type="default">kmod-devel</packagereq>
@@ -8258,7 +8253,7 @@
       <packagereq type="default">libIDL-devel</packagereq>
       <packagereq type="default">libidn2-devel</packagereq>
       <packagereq type="default">libidn-devel</packagereq>
-      <packagereq type="default">libiec61883-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">libiec61883-devel</packagereq>
       <packagereq type="default">libimobiledevice-devel</packagereq>
       <packagereq type="default">libindicator-gtk3-devel</packagereq>
       <packagereq type="default">libini_config-devel</packagereq>
@@ -8318,7 +8313,7 @@
       <packagereq type="default" arch="x86_64">libvmem-debug</packagereq>
       <packagereq type="default" arch="x86_64">libvmmalloc-debug</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
-      <packagereq type="default">libpsm2-devel</packagereq>
+      <packagereq type="default" arch="x86_64">libpsm2-devel</packagereq>
       <packagereq type="default">libpsl-devel</packagereq>
       <packagereq type="default">libpurple-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
@@ -8330,7 +8325,7 @@
       <packagereq type="default">librados-devel</packagereq>
       <packagereq type="default">libradosstriper1</packagereq>
       <packagereq type="default">libradosstriper-devel</packagereq>
-      <packagereq type="default">libraw1394-devel</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">libraw1394-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">LibRaw-devel</packagereq>
       <packagereq type="default">librbd-devel</packagereq>
       <packagereq type="default">librdkafka-devel</packagereq>
@@ -8351,6 +8346,7 @@
       <packagereq type="default">libsigc++20-doc</packagereq>
       <packagereq type="default">libsigsegv-devel</packagereq>
       <packagereq type="default">libsmbclient-devel</packagereq>
+      <packagereq type="default">libsmi-devel</packagereq>
       <packagereq type="default">libsndfile-devel</packagereq>
       <packagereq type="default">libspectre-devel</packagereq>
       <packagereq type="default">libsrtp-devel</packagereq>
@@ -8463,93 +8459,93 @@
       <packagereq type="default">metis</packagereq>
       <packagereq type="default">metis-devel</packagereq>
       <packagereq type="default">mingw32-binutils</packagereq>
-      <packagereq type="default">mingw32-bzip2</packagereq>
-      <packagereq type="default">mingw32-bzip2-static</packagereq>
-      <packagereq type="default">mingw32-cairo</packagereq>
-      <packagereq type="default">mingw32-cpp</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-bzip2</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-bzip2-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-cairo</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-cpp</packagereq>
       <packagereq type="default">mingw32-crt</packagereq>
-      <packagereq type="default">mingw32-expat</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-expat</packagereq>
       <packagereq type="default">mingw32-filesystem</packagereq>
-      <packagereq type="default">mingw32-fontconfig</packagereq>
-      <packagereq type="default">mingw32-freetype</packagereq>
-      <packagereq type="default">mingw32-freetype-static</packagereq>
-      <packagereq type="default">mingw32-gcc</packagereq>
-      <packagereq type="default">mingw32-gcc-c++</packagereq>
-      <packagereq type="default">mingw32-gettext</packagereq>
-      <packagereq type="default">mingw32-gettext-static</packagereq>
-      <packagereq type="default">mingw32-glib2</packagereq>
-      <packagereq type="default">mingw32-glib2-static</packagereq>
-      <packagereq type="default">mingw32-gstreamer1</packagereq>
-      <packagereq type="default">mingw32-harfbuzz</packagereq>
-      <packagereq type="default">mingw32-harfbuzz-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-fontconfig</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-freetype</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-freetype-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-gcc</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-gcc-c++</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-gettext</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-gettext-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-glib2</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-glib2-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-gstreamer1</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-harfbuzz</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-harfbuzz-static</packagereq>
       <packagereq type="default">mingw32-headers</packagereq>
-      <packagereq type="default">mingw32-icu</packagereq>
-      <packagereq type="default">mingw32-libffi</packagereq>
-      <packagereq type="default">mingw32-libjpeg-turbo</packagereq>
-      <packagereq type="default">mingw32-libjpeg-turbo-static</packagereq>
-      <packagereq type="default">mingw32-libpng</packagereq>
-      <packagereq type="default">mingw32-libpng-static</packagereq>
-      <packagereq type="default">mingw32-libtiff</packagereq>
-      <packagereq type="default">mingw32-libtiff-static</packagereq>
-      <packagereq type="default">mingw32-openssl</packagereq>
-      <packagereq type="default">mingw32-pcre</packagereq>
-      <packagereq type="default">mingw32-pcre-static</packagereq>
-      <packagereq type="default">mingw32-pixman</packagereq>
-      <packagereq type="default">mingw32-pkg-config</packagereq>
-      <packagereq type="default">mingw32-readline</packagereq>
-      <packagereq type="default">mingw32-sqlite</packagereq>
-      <packagereq type="default">mingw32-sqlite-static</packagereq>
-      <packagereq type="default">mingw32-termcap</packagereq>
-      <packagereq type="default">mingw32-win-iconv</packagereq>
-      <packagereq type="default">mingw32-win-iconv-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-icu</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libffi</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libjpeg-turbo</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libjpeg-turbo-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libpng</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libpng-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libtiff</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-libtiff-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-openssl</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-pcre</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-pcre-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-pixman</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-pkg-config</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-readline</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-sqlite</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-sqlite-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-termcap</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-win-iconv</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-win-iconv-static</packagereq>
       <packagereq type="default">mingw32-winpthreads</packagereq>
       <packagereq type="default">mingw32-winpthreads-static</packagereq>
-      <packagereq type="default">mingw32-zlib</packagereq>
-      <packagereq type="default">mingw32-zlib-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-zlib</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-zlib-static</packagereq>
       <packagereq type="default">mingw64-binutils</packagereq>
-      <packagereq type="default">mingw64-bzip2</packagereq>
-      <packagereq type="default">mingw64-bzip2-static</packagereq>
-      <packagereq type="default">mingw64-cairo</packagereq>
-      <packagereq type="default">mingw64-cpp</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-bzip2</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-bzip2-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-cairo</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-cpp</packagereq>
       <packagereq type="default">mingw64-crt</packagereq>
-      <packagereq type="default">mingw64-expat</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-expat</packagereq>
       <packagereq type="default">mingw64-filesystem</packagereq>
-      <packagereq type="default">mingw64-fontconfig</packagereq>
-      <packagereq type="default">mingw64-freetype</packagereq>
-      <packagereq type="default">mingw64-freetype-static</packagereq>
-      <packagereq type="default">mingw64-gcc</packagereq>
-      <packagereq type="default">mingw64-gcc-c++</packagereq>
-      <packagereq type="default">mingw64-gettext</packagereq>
-      <packagereq type="default">mingw64-gettext-static</packagereq>
-      <packagereq type="default">mingw64-glib2</packagereq>
-      <packagereq type="default">mingw64-glib2-static</packagereq>
-      <packagereq type="default">mingw64-gstreamer1</packagereq>
-      <packagereq type="default">mingw64-harfbuzz</packagereq>
-      <packagereq type="default">mingw64-harfbuzz-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-fontconfig</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-freetype</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-freetype-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-gcc</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-gcc-c++</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-gettext</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-gettext-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-glib2</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-glib2-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-gstreamer1</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-harfbuzz</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-harfbuzz-static</packagereq>
       <packagereq type="default">mingw64-headers</packagereq>
-      <packagereq type="default">mingw64-icu</packagereq>
-      <packagereq type="default">mingw64-libffi</packagereq>
-      <packagereq type="default">mingw64-libjpeg-turbo</packagereq>
-      <packagereq type="default">mingw64-libjpeg-turbo-static</packagereq>
-      <packagereq type="default">mingw64-libpng</packagereq>
-      <packagereq type="default">mingw64-libpng-static</packagereq>
-      <packagereq type="default">mingw64-libtiff</packagereq>
-      <packagereq type="default">mingw64-libtiff-static</packagereq>
-      <packagereq type="default">mingw64-openssl</packagereq>
-      <packagereq type="default">mingw64-pcre</packagereq>
-      <packagereq type="default">mingw64-pcre-static</packagereq>
-      <packagereq type="default">mingw64-pixman</packagereq>
-      <packagereq type="default">mingw64-pkg-config</packagereq>
-      <packagereq type="default">mingw64-readline</packagereq>
-      <packagereq type="default">mingw64-sqlite</packagereq>
-      <packagereq type="default">mingw64-sqlite-static</packagereq>
-      <packagereq type="default">mingw64-termcap</packagereq>
-      <packagereq type="default">mingw64-win-iconv</packagereq>
-      <packagereq type="default">mingw64-win-iconv-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-icu</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libffi</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libjpeg-turbo</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libjpeg-turbo-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libpng</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libpng-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libtiff</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-libtiff-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-openssl</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-pcre</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-pcre-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-pixman</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-pkg-config</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-readline</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-sqlite</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-sqlite-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-termcap</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-win-iconv</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-win-iconv-static</packagereq>
       <packagereq type="default">mingw64-winpthreads</packagereq>
       <packagereq type="default">mingw64-winpthreads-static</packagereq>
-      <packagereq type="default">mingw64-zlib</packagereq>
-      <packagereq type="default">mingw64-zlib-static</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-zlib</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-zlib-static</packagereq>
       <packagereq type="default">mingw-binutils-generic</packagereq>
       <packagereq type="default">mingw-filesystem-base</packagereq>
       <packagereq type="default">mockito</packagereq>
@@ -8626,7 +8622,7 @@
       <packagereq type="default">pandoc</packagereq>
       <packagereq type="default">pangomm-devel</packagereq>
       <packagereq type="default">pangomm-doc</packagereq>
-      <packagereq type="default">papi-testsuite</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>
       <packagereq type="default">parted-devel</packagereq>
       <packagereq type="default">pcre2-tools</packagereq>
       <packagereq type="default">pcre-static</packagereq>
@@ -8687,7 +8683,6 @@
       <packagereq type="default">perl-Importer</packagereq>
       <packagereq type="default">perl-Import-Into</packagereq>
       <packagereq type="default">perl-IO-All</packagereq>
-      <packagereq type="default">perl-IO-String</packagereq>
       <packagereq type="default">perl-IO-stringy</packagereq>
       <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">perl-IPC-Run</packagereq>
@@ -8803,15 +8798,14 @@
       <packagereq type="default">ptscotch-mpich-devel-parmetis</packagereq>
       <packagereq type="default">ptscotch-openmpi</packagereq>
       <packagereq type="default">ptscotch-openmpi-devel</packagereq>
+      <packagereq type="default">py3c-devel</packagereq>
+      <packagereq type="default">py3c-doc</packagereq>
       <packagereq type="default">pygobject3-devel</packagereq>
       <packagereq type="default">python-cups-doc</packagereq>
-      <packagereq type="default">python-wcwidth</packagereq>
-      
       <packagereq type="default">python2-gluster</packagereq>
       <packagereq type="default">python2-iso8601</packagereq>
       <packagereq type="default">python2-scipy</packagereq>
       <packagereq type="default">python2-talloc</packagereq>
-      <packagereq type="default">python3-cheetah</packagereq>
       <packagereq type="default">python3-Cython</packagereq>
       <packagereq type="default">python3-greenlet-devel</packagereq>
       <packagereq type="default">python3-html5lib</packagereq>
@@ -8843,7 +8837,9 @@
       <packagereq type="default">python3-whoosh</packagereq>
       <packagereq type="default">python-sphinx-locale</packagereq>
       <packagereq type="default">qdox</packagereq>
+      <packagereq type="default">qgpgme-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
+      <packagereq type="default">quota-devel</packagereq>
       <packagereq type="default">qrencode-devel</packagereq>
       <packagereq type="default">qt5-devel</packagereq>
       <packagereq type="default">qt5-qtbase-static</packagereq>
@@ -8893,7 +8889,7 @@
       <packagereq type="default">speech-dispatcher-doc</packagereq>
       <packagereq type="default">speex-devel</packagereq>
       <packagereq type="default">speexdsp-devel</packagereq>
-      <packagereq type="default">spice-server-devel</packagereq>
+      <packagereq type="default" arch="aarch64,x86_64">spice-server-devel</packagereq>
       <packagereq type="default">spirv-tools-devel</packagereq>
       <packagereq type="default">suitesparse-devel</packagereq>
       <packagereq type="default">SuperLU</packagereq>
@@ -8910,7 +8906,6 @@
       <packagereq type="default">tix</packagereq>
       <packagereq type="default">tix-devel</packagereq>
       <packagereq type="default">tokyocabinet-devel</packagereq>
-      <packagereq type="default">tokyocabinet-doc</packagereq>
       <packagereq type="default">tog-pegasus-devel</packagereq>
       <packagereq type="default">torque</packagereq>
       <packagereq type="default">torque-devel</packagereq>
@@ -8977,7 +8972,6 @@
       <packagereq type="default">xz-java</packagereq>
       <packagereq type="default">xz-lzma-compat</packagereq>
       <packagereq type="default">yajl-devel</packagereq>
-      <packagereq type="default">yaml-cpp-devel</packagereq>
       <packagereq type="default">yasm</packagereq>
       <packagereq type="default">yelp-devel</packagereq>
       <packagereq type="default">zlib-static</packagereq>