fix up i686 for another test

9fa41b28 · Louis Abel · ce2b1ad7 · 9fa41b28
Verified Commit 9fa41b28 authored 3 years ago by Louis Abel
--- a/comps-rocky-8.4-i686.xml
+++ b/comps-rocky-8.4-i686.xml
@@ -153,8 +153,8 @@
      <packagereq variant="BaseOS">libusbx-devel</packagereq>
      <packagereq variant="BaseOS">libuuid-devel</packagereq>
      <packagereq variant="BaseOS">lksctp-tools-devel</packagereq>
-      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64,i686">numactl-devel</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">papi-devel</packagereq>
+      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64">numactl-devel</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">papi-devel</packagereq>
      <packagereq variant="BaseOS">pciutils-devel</packagereq>
      <packagereq variant="BaseOS">pcre-devel</packagereq>
      <packagereq variant="BaseOS">polkit-devel</packagereq>
@@ -192,18 +192,18 @@
      <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" arch="x86_64,i686">libva-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libva-devel</packagereq>
      <packagereq variant="AppStream">libnotify-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmem-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmemblk-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmemlog-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmemobj-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmemobj++-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmemobj++-doc</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libpmempool-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">librpmem-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libvmem-devel</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">libvmmalloc-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmem-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmemblk-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmemlog-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmemobj-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmemobj++-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmemobj++-doc</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libpmempool-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">librpmem-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libvmem-devel</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">libvmmalloc-devel</packagereq>
      <packagereq variant="AppStream">libpq-devel</packagereq>
      <packagereq variant="AppStream">librsvg2-devel</packagereq>
      <packagereq variant="AppStream">librsvg2-tools</packagereq>
@@ -261,22 +261,22 @@
      <packagereq variant="BaseOS">dosfstools</packagereq>
      <packagereq variant="BaseOS">dracut-network</packagereq>
      <packagereq variant="BaseOS">e2fsprogs</packagereq>
-      <packagereq variant="BaseOS" arch="aarch64,x86_64,i686">efibootmgr</packagereq>
+      <packagereq variant="BaseOS" arch="aarch64,x86_64">efibootmgr</packagereq>
      <packagereq variant="BaseOS">fcoe-utils</packagereq>
      <packagereq variant="BaseOS">firewalld</packagereq>
      <packagereq variant="BaseOS">gfs2-utils</packagereq>
      <packagereq variant="BaseOS">glibc-all-langpacks</packagereq>
      <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64</packagereq>
      <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64-cdboot</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-efi-ia32</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-efi-ia32-cdboot</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-efi-x64</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-efi-x64-cdboot</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-pc</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32-cdboot</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64-cdboot</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-pc</packagereq>
      <packagereq variant="BaseOS" arch="ppc64le">grub2-ppc64le</packagereq>
-      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64,i686">grub2-tools</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">grub2-tools-efi</packagereq>
-      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64,i686">grub2-tools-extra</packagereq>
+      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64">grub2-tools</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">grub2-tools-efi</packagereq>
+      <packagereq variant="BaseOS" arch="aarch64,ppc64le,x86_64">grub2-tools-extra</packagereq>
      <packagereq variant="BaseOS">iscsi-initiator-utils</packagereq>
      <packagereq variant="AppStream">kdump-anaconda-addon</packagereq>
      <packagereq variant="BaseOS">lvm2</packagereq>
@@ -285,9 +285,9 @@
      <packagereq variant="AppStream" arch="s390x">s390utils</packagereq>
      <packagereq variant="BaseOS" arch="s390x">s390utils-base</packagereq>
      <packagereq variant="BaseOS" arch="aarch64">shim-aa64</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">shim-ia32</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">shim-x64</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">syslinux-extlinux</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">shim-ia32</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">shim-x64</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">syslinux-extlinux</packagereq>
      <packagereq variant="BaseOS">teamd</packagereq>
      <packagereq variant="BaseOS">tmux</packagereq>
      <packagereq variant="BaseOS">xfsprogs</packagereq>
@@ -325,15 +325,15 @@
      <packagereq variant="AppStream">glx-utils</packagereq>
      <packagereq variant="AppStream">mesa-dri-drivers</packagereq>
      <packagereq variant="AppStream">plymouth-system-theme</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">xorg-x11-drv-ati</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">xorg-x11-drv-ati</packagereq>
      <packagereq variant="AppStream">xorg-x11-drv-evdev</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">xorg-x11-drv-fbdev</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">xorg-x11-drv-intel</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">xorg-x11-drv-fbdev</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">xorg-x11-drv-intel</packagereq>
      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">xorg-x11-drv-nouveau</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">xorg-x11-drv-qxl</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">xorg-x11-drv-vesa</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">xorg-x11-drv-vmware</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">xorg-x11-drv-nouveau</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">xorg-x11-drv-qxl</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">xorg-x11-drv-vesa</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">xorg-x11-drv-vmware</packagereq>
      <packagereq variant="AppStream">xorg-x11-drv-wacom</packagereq>
      <packagereq variant="AppStream">xorg-x11-server-Xorg</packagereq>
      <packagereq variant="AppStream">xorg-x11-utils</packagereq>
@@ -519,7 +519,7 @@
      <packagereq variant="BaseOS" type="mandatory">iproute</packagereq>
      <packagereq variant="BaseOS" type="mandatory">iprutils</packagereq>
      <packagereq variant="BaseOS" type="mandatory">iputils</packagereq>
-      <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64,i686">irqbalance</packagereq>
+      <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64">irqbalance</packagereq>
      <packagereq variant="BaseOS" type="mandatory">kbd</packagereq>
      <packagereq variant="BaseOS" type="mandatory">kexec-tools</packagereq>
      <packagereq variant="BaseOS" type="mandatory">less</packagereq>
@@ -548,7 +548,7 @@
      <packagereq variant="BaseOS" type="mandatory">vim-minimal</packagereq>
      <packagereq variant="BaseOS" type="mandatory">xfsprogs</packagereq>
      <packagereq variant="BaseOS" type="default">authselect</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">biosdevname</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">biosdevname</packagereq>
      <packagereq variant="BaseOS" type="default">prefixdevname</packagereq>
      <packagereq variant="BaseOS" type="default">dnf-plugins-core</packagereq>
      <packagereq variant="BaseOS" type="default">dracut-config-rescue</packagereq>
@@ -573,7 +573,7 @@
      <packagereq variant="BaseOS" type="default">lshw</packagereq>
      <packagereq variant="BaseOS" type="default">lsscsi</packagereq>
      <packagereq variant="BaseOS" type="default">kernel-tools</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">microcode_ctl</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">microcode_ctl</packagereq>
      <packagereq variant="BaseOS" type="default" arch="ppc64le">opal-prd</packagereq>
      <packagereq variant="BaseOS" type="default" arch="ppc64le">ppc64-diag</packagereq>
      <packagereq variant="BaseOS" type="default" arch="ppc64le">powerpc-utils</packagereq>
@@ -586,7 +586,7 @@
      <packagereq variant="BaseOS" type="optional" arch="s390x">libzfcphbaapi</packagereq>
      <packagereq variant="BaseOS" type="optional">rdma-core</packagereq>
      <packagereq variant="BaseOS" type="optional">selinux-policy-mls</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="x86_64,i686">tboot</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="x86_64">tboot</packagereq>
      <packagereq variant="AppStream" type="optional">initial-setup</packagereq>
    </packagelist>
  </group>
@@ -661,7 +661,7 @@
      <packagereq variant="BaseOS" type="default">kernel-tools</packagereq>
      <packagereq variant="BaseOS" type="optional">memstrack</packagereq>
      <packagereq variant="BaseOS" type="default">trace-cmd</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="x86_64,i686">memtest86+</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="x86_64">memtest86+</packagereq>
      <packagereq variant="AppStream" type="mandatory">gdb</packagereq>
      <packagereq variant="AppStream" type="mandatory">libreport-cli</packagereq>
      <packagereq variant="AppStream" type="mandatory">systemtap-runtime</packagereq>
@@ -669,13 +669,13 @@
      <packagereq variant="AppStream" type="default">abrt-cli</packagereq>
      <packagereq variant="AppStream" type="default">python3-abrt-addon</packagereq>
      <packagereq variant="AppStream" type="default">crash</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686">crash-gcore-command</packagereq>
-      <packagereq variant="AppStream" type="default" arch="x86_64,i686">crash-ptdump-command</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">crash-gcore-command</packagereq>
+      <packagereq variant="AppStream" type="default" arch="x86_64">crash-ptdump-command</packagereq>
      <packagereq variant="AppStream" type="default">crash-trace-command</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686,s390x">valgrind</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686,s390x">valgrind-devel</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind-devel</packagereq>
      <packagereq variant="AppStream" type="optional">bpftrace</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="x86_64,i686">xdp-tools</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="x86_64">xdp-tools</packagereq>
      <packagereq variant="AppStream" type="optional">gdb-gdbserver</packagereq>
      <packagereq variant="AppStream" type="optional">glibc-utils</packagereq>
      <packagereq variant="AppStream" type="optional">systemtap-client</packagereq>
@@ -748,8 +748,8 @@
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq variant="AppStream" type="default">crash</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686">crash-gcore-command</packagereq>
-      <packagereq variant="AppStream" type="default" arch="x86_64,i686">crash-ptdump-command</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">crash-gcore-command</packagereq>
+      <packagereq variant="AppStream" type="default" arch="x86_64">crash-ptdump-command</packagereq>
      <packagereq variant="AppStream" type="default">crash-trace-command</packagereq>
      <packagereq variant="BaseOS" type="default">libreport-gtk</packagereq>
      <packagereq variant="BaseOS" type="optional">tuna</packagereq>
@@ -901,7 +901,7 @@
      <packagereq variant="BaseOS" type="optional">isns-utils</packagereq>
    </packagelist>
  </group>
-  <group arch="aarch64,s390x,x86_64,i686,ppc64le">
+  <group arch="aarch64,s390x,x86_64,ppc64le,i686">
    <id>gnome-desktop</id>
    <name>GNOME</name>
    <name xml:lang="af">GNOME</name>
@@ -984,25 +984,25 @@
      <packagereq variant="BaseOS">polkit</packagereq>
      <packagereq variant="AppStream">at-spi2-core</packagereq>
      <packagereq variant="AppStream">baobab</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">cheese</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">cheese</packagereq>
      <packagereq variant="AppStream">chrome-gnome-shell</packagereq>
      <packagereq variant="AppStream">gnome-control-center</packagereq>
      <packagereq variant="AppStream">dconf</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">eog</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">eog</packagereq>
      <packagereq variant="AppStream">evince</packagereq>
      <packagereq variant="AppStream">evince-nautilus</packagereq>
      <packagereq variant="AppStream">file-roller</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">fprintd-pam</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">fprintd-pam</packagereq>
      <packagereq variant="AppStream">gdm</packagereq>
      <packagereq variant="AppStream">gedit</packagereq>
      <packagereq variant="AppStream" type="optional">gedit-plugins</packagereq>
      <packagereq variant="AppStream" type="optional">gnome-backgrounds</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">gnome-bluetooth</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">gnome-boxes</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">gnome-bluetooth</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">gnome-boxes</packagereq>
      <packagereq variant="AppStream">gnome-calculator</packagereq>
      <packagereq variant="AppStream">gnome-characters</packagereq>
      <packagereq variant="AppStream">gnome-classic-session</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">gnome-color-manager</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">gnome-color-manager</packagereq>
      <packagereq variant="AppStream">gnome-disk-utility</packagereq>
      <packagereq variant="AppStream">gnome-font-viewer</packagereq>
      <packagereq variant="AppStream">gnome-getting-started-docs</packagereq>
@@ -1024,7 +1024,7 @@
      <packagereq variant="AppStream">gnome-terminal-nautilus</packagereq>
      <packagereq variant="AppStream">gnome-themes-standard</packagereq>
      <packagereq variant="AppStream">gnome-user-docs</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64,i686">gvfs-afc</packagereq>
+      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">gvfs-afc</packagereq>
      <packagereq variant="AppStream">gvfs-afp</packagereq>
      <packagereq variant="AppStream">gvfs-archive</packagereq>
      <packagereq variant="AppStream">gvfs-fuse</packagereq>
@@ -1044,8 +1044,8 @@
      <packagereq variant="AppStream">PackageKit-gtk3-module</packagereq>
      <packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
      <packagereq variant="AppStream">sushi</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">totem</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">totem-nautilus</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">totem</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">totem-nautilus</packagereq>
      <packagereq variant="AppStream">tracker</packagereq>
      <packagereq variant="AppStream">tracker-miners</packagereq>
      <packagereq variant="AppStream">vino</packagereq>
@@ -1056,7 +1056,7 @@
      <packagereq variant="AppStream">yelp-tools</packagereq>
    </packagelist>
  </group>
-  <group arch="x86_64,i686,ppc64le">
+  <group arch="x86_64,ppc64le,i686">
    <id>graphical-admin-tools</id>
    <name>Graphical Administration Tools</name>
    <name xml:lang="as">গ্ৰাফিকেল পদ্ধতিত ব্যৱহাৰযোগ্য প্ৰশাসনিক সঁজুলিসমূহ</name>
@@ -1127,7 +1127,7 @@
      <packagereq variant="AppStream" type="optional">wireshark</packagereq>
    </packagelist>
  </group>
-  <group arch="x86_64,i686,ppc64le,aarch64">
+  <group arch="x86_64,ppc64le,aarch64,i686">
    <id>guest-agents</id>
    <name>Guest Agents</name>
    <name xml:lang="as">অতিথি সহায়ক</name>
@@ -1186,8 +1186,8 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq variant="AppStream" arch="x86_64,i686">hyperv-daemons</packagereq>
-      <packagereq variant="AppStream" arch="x86_64,i686">open-vm-tools</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">hyperv-daemons</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">open-vm-tools</packagereq>
      <packagereq variant="AppStream">qemu-guest-agent</packagereq>
    </packagelist>
  </group>
@@ -1250,11 +1250,11 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq type="default" arch="x86_64,i686">mcelog</packagereq>
-      <packagereq type="default" arch="aarch64,x86_64,i686,ppc64le">rasdaemon</packagereq>
+      <packagereq type="default" arch="x86_64">mcelog</packagereq>
+      <packagereq type="default" arch="aarch64,x86_64,ppc64le">rasdaemon</packagereq>
      <packagereq type="default">smartmontools</packagereq>
      <packagereq type="optional">lm_sensors</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">intel-cmt-cat</packagereq>
+      <packagereq type="optional" arch="x86_64">intel-cmt-cat</packagereq>
    </packagelist>
  </group>
  <group variant="BaseOS">
@@ -1285,7 +1285,7 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq type="default" arch="x86_64,i686">alsa-sof-firmware</packagereq>
+      <packagereq type="default" arch="x86_64">alsa-sof-firmware</packagereq>
      <packagereq type="default">bolt</packagereq>
      <packagereq type="default">iwl100-firmware</packagereq>
      <packagereq type="default">iwl1000-firmware</packagereq>
@@ -1350,7 +1350,7 @@
      <packagereq variant="AppStream" type="default">sscg</packagereq>
    </packagelist>
  </group>
-  <group arch="x86_64,i686,ppc64le,aarch64">
+  <group arch="x86_64,ppc64le,aarch64,i686">
    <id>infiniband</id>
    <name>Infiniband Support</name>
    <name xml:lang="as">Infiniband সমৰ্থন</name>
@@ -1404,12 +1404,12 @@
      <packagereq variant="BaseOS" type="default">ibacm</packagereq>
      <packagereq variant="BaseOS" type="default">libibmad</packagereq>
      <packagereq variant="BaseOS" type="default">libibumad</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">libpsm2</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">libpsm2-compat</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">opa-fastfabric</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">opa-basic-tools</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">opa-libopamgt</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="x86_64,i686">opa-address-resolution</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">libpsm2</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">libpsm2-compat</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">opa-fastfabric</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">opa-basic-tools</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">opa-libopamgt</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="x86_64">opa-address-resolution</packagereq>
      <packagereq variant="BaseOS" type="conditional" requires="glusterfs">glusterfs-rdma</packagereq>
      <packagereq variant="BaseOS" type="default">infiniband-diags</packagereq>
      <packagereq variant="BaseOS" type="default">iwpmd</packagereq>
@@ -1417,9 +1417,9 @@
      <packagereq variant="AppStream" type="default">qperf</packagereq>
      <packagereq variant="BaseOS" type="default">srp_daemon</packagereq>
      <packagereq variant="BaseOS" type="optional">opensm</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="x86_64,i686">opa-fm</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64,i686">libvma</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686">mstflint</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="x86_64">opa-fm</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">libvma</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">mstflint</packagereq>
    </packagelist>
  </group>
  <group variant="BaseOS">
@@ -1484,12 +1484,12 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64,i686,s390x">numactl</packagereq>
-      <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64,i686">numad</packagereq>
+      <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64,s390x">numactl</packagereq>
+      <packagereq type="mandatory" arch="aarch64,ppc64le,x86_64">numad</packagereq>
      <packagereq type="default">hwloc</packagereq>
      <packagereq type="default">libhugetlbfs</packagereq>
      <packagereq type="default">libhugetlbfs-utils</packagereq>
-      <packagereq type="optional" arch="ppc64le,x86_64,i686">numatop</packagereq>
+      <packagereq type="optional" arch="ppc64le,x86_64">numatop</packagereq>
    </packagelist>
  </group>
  <group>
@@ -2130,7 +2130,7 @@
    <packagelist>
      <packagereq variant="BaseOS" type="optional">dhcp-server</packagereq>
      <packagereq variant="BaseOS" type="optional">krb5-server</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="x86_64,i686">syslinux</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="x86_64">syslinux</packagereq>
      <packagereq variant="AppStream" type="optional">dnsmasq</packagereq>
      <packagereq variant="AppStream" type="optional">freeradius</packagereq>
      <packagereq variant="AppStream" type="optional">idn2</packagereq>
@@ -2302,9 +2302,9 @@
      <packagereq variant="BaseOS" type="default">elfutils</packagereq>
      <packagereq variant="BaseOS" type="default">strace</packagereq>
      <packagereq variant="AppStream" type="optional">libpfm</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64,i686">papi</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64,i686">papi-devel</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="aarch64,ppc64le,x86_64,i686">hdparm</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">papi</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">papi-devel</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="aarch64,ppc64le,x86_64">hdparm</packagereq>
      <packagereq variant="BaseOS" type="optional">tuned-profiles-cpu-partitioning</packagereq>
      <packagereq variant="AppStream" type="mandatory">sysstat</packagereq>
      <packagereq variant="AppStream" type="default">iowatcher</packagereq>
@@ -2348,7 +2348,7 @@
      <packagereq variant="AppStream" type="default">pcp-pmda-gpsd</packagereq>
      <packagereq variant="AppStream" type="optional">pcp-pmda-hacluster</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-haproxy</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686">pcp-pmda-infiniband</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">pcp-pmda-infiniband</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-json</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-kvm</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-libvirt</packagereq>
@@ -2361,7 +2361,7 @@
      <packagereq variant="AppStream" type="default">pcp-pmda-memcache</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-mic</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-mounts</packagereq>
-      <packagereq variant="AppStream" type="default" arch="x86_64,i686">pcp-pmda-mssql</packagereq>
+      <packagereq variant="AppStream" type="default" arch="x86_64">pcp-pmda-mssql</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-mysql</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-named</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-netcheck</packagereq>
@@ -2374,7 +2374,7 @@
      <packagereq variant="AppStream" type="default">pcp-pmda-openvswitch</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-oracle</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-pdns</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686">pcp-pmda-perfevent</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">pcp-pmda-perfevent</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-podman</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-postfix</packagereq>
      <packagereq variant="AppStream" type="default">pcp-pmda-postgresql</packagereq>
@@ -2521,12 +2521,12 @@
      <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,i686,ppc64le,aarch64">qt5-qtwayland</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>
      <packagereq variant="AppStream" type="optional">spirv-tools-libs</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="x86_64,i686">vulkan-tools</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="x86_64,i686">vulkan-validation-layers</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="x86_64">vulkan-tools</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="x86_64">vulkan-validation-layers</packagereq>
    </packagelist>
  </group>
  <group>
@@ -2729,7 +2729,7 @@
    <packagelist>
      <packagereq variant="BaseOS" type="optional">hmaccalc</packagereq>
      <packagereq variant="BaseOS" type="optional">tpm-tools</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="x86_64,i686">tpm2-tools</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="x86_64">tpm2-tools</packagereq>
      <packagereq variant="BaseOS" type="optional">tpm-quote-tools</packagereq>
      <packagereq variant="BaseOS" type="optional" arch="ppc64le">tss2</packagereq>
      <packagereq variant="BaseOS" type="optional">trousers</packagereq>
@@ -2743,7 +2743,7 @@
      <packagereq variant="AppStream" type="optional">udica</packagereq>
    </packagelist>
  </group>
-  <group arch="x86_64,i686,ppc64le,aarch64">
+  <group arch="x86_64,ppc64le,aarch64,i686">
    <id>smart-card</id>
    <name>Smart Card Support</name>
    <name xml:lang="as">স্মাৰ্ট কাৰ্ড সমৰ্থন</name>
@@ -3042,13 +3042,13 @@
      <packagereq variant="BaseOS" type="mandatory">ed</packagereq>
      <packagereq variant="BaseOS" type="mandatory">file</packagereq>
      <packagereq variant="BaseOS" type="mandatory">iptstate</packagereq>
-      <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64,i686">irqbalance</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,i686">mcelog</packagereq>
-      <packagereq variant="BaseOS" type="mandatory" arch="x86_64,i686">microcode_ctl</packagereq>
+      <packagereq variant="BaseOS" type="mandatory" arch="x86_64">mcelog</packagereq>
+      <packagereq variant="BaseOS" type="mandatory" arch="x86_64">microcode_ctl</packagereq>
      <packagereq variant="BaseOS" type="mandatory">net-tools</packagereq>
      <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
      <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
@@ -3112,7 +3112,7 @@
      <packagereq variant="BaseOS" type="default">zip</packagereq>
      <packagereq variant="BaseOS" type="optional">cifs-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">fwupd</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="aarch64,x86_64,i686">fwupdate</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="aarch64,x86_64">fwupdate</packagereq>
      <packagereq variant="BaseOS" type="optional">ima-evm-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">nfs-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">nvmetcli</packagereq>
@@ -3120,7 +3120,7 @@
      <packagereq variant="BaseOS" type="optional">traceroute</packagereq>
      <packagereq variant="BaseOS" type="optional">zsh</packagereq>
      <packagereq variant="BaseOS" type="optional">cockpit-doc</packagereq>
-      <packagereq variant="AppStream" type="default" arch="ppc64le,x86_64,i686">fprintd-pam</packagereq>
+      <packagereq variant="AppStream" type="default" arch="ppc64le,x86_64">fprintd-pam</packagereq>
      <packagereq variant="AppStream" type="default">nmap-ncat</packagereq>
      <packagereq variant="AppStream" type="default">tcpdump</packagereq>
      <packagereq variant="AppStream" type="default">wget</packagereq>
@@ -3221,13 +3221,13 @@
      <packagereq variant="BaseOS" type="mandatory">ed</packagereq>
      <packagereq variant="BaseOS" type="mandatory">file</packagereq>
      <packagereq variant="BaseOS" type="mandatory">iptstate</packagereq>
-      <packagereq variant="BaseOS" type="mandatory" arch="aarch64,ppc64le,x86_64,i686">irqbalance</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,i686">mcelog</packagereq>
-      <packagereq variant="BaseOS" type="mandatory" arch="x86_64,i686">microcode_ctl</packagereq>
+      <packagereq variant="BaseOS" type="mandatory" arch="x86_64">mcelog</packagereq>
+      <packagereq variant="BaseOS" type="mandatory" arch="x86_64">microcode_ctl</packagereq>
      <packagereq variant="BaseOS" type="mandatory">net-tools</packagereq>
      <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
      <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
@@ -3291,7 +3291,7 @@
      <packagereq variant="BaseOS" type="default">zip</packagereq>
      <packagereq variant="BaseOS" type="optional">cifs-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">fwupd</packagereq>
-      <packagereq variant="BaseOS" type="optional" arch="aarch64,x86_64,i686">fwupdate</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="aarch64,x86_64">fwupdate</packagereq>
      <packagereq variant="BaseOS" type="optional">ima-evm-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">nfs-utils</packagereq>
      <packagereq variant="BaseOS" type="optional">nvmetcli</packagereq>
@@ -3299,7 +3299,7 @@
      <packagereq variant="BaseOS" type="optional">traceroute</packagereq>
      <packagereq variant="BaseOS" type="optional">zsh</packagereq>
      <packagereq variant="BaseOS" type="optional">cockpit-doc</packagereq>
-      <packagereq variant="AppStream" type="default" arch="ppc64le,x86_64,i686">fprintd-pam</packagereq>
+      <packagereq variant="AppStream" type="default" arch="ppc64le,x86_64">fprintd-pam</packagereq>
      <packagereq variant="AppStream" type="default">nmap-ncat</packagereq>
      <packagereq variant="AppStream" type="default">tcpdump</packagereq>
      <packagereq variant="AppStream" type="default">wget</packagereq>
@@ -3468,7 +3468,7 @@
      <packagereq variant="BaseOS" type="default">cifs-utils</packagereq>
      <packagereq variant="BaseOS" type="default">openldap-clients</packagereq>
      <packagereq variant="BaseOS" type="default">samba-client</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="aarch64,ppc64le,x86_64,i686">setserial</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="aarch64,ppc64le,x86_64">setserial</packagereq>
      <packagereq variant="BaseOS" type="default">tmux</packagereq>
      <packagereq variant="BaseOS" type="default">xdelta</packagereq>
      <packagereq variant="BaseOS" type="default">zsh</packagereq>
@@ -3500,8 +3500,8 @@
      <packagereq variant="AppStream" type="optional">oddjob</packagereq>
      <packagereq variant="AppStream" type="optional">oddjob-mkhomedir</packagereq>
      <packagereq variant="AppStream" type="optional">PackageKit-command-not-found</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="x86_64,i686">pmdk-convert</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64,i686">rear</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="x86_64">pmdk-convert</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">rear</packagereq>
      <packagereq variant="AppStream" type="optional">speech-dispatcher</packagereq>
      <packagereq variant="AppStream" type="optional">speech-dispatcher-espeak-ng</packagereq>
      <packagereq variant="AppStream" type="optional">sysstat</packagereq>
@@ -3969,7 +3969,7 @@
      <packagereq type="optional">mod_security_crs</packagereq>
    </packagelist>
  </group>
-  <group arch="aarch64,s390x,x86_64,i686,ppc64le">
+  <group arch="aarch64,s390x,x86_64,ppc64le,i686">
    <id>workstation-product</id>
    <name>Workstation product core</name>
    <name xml:lang="de">Workstation-Produktkern</name>
@@ -4022,9 +4022,9 @@
      <packagereq variant="BaseOS">lsof</packagereq>
      <packagereq variant="BaseOS">mailcap</packagereq>
      <packagereq variant="BaseOS">man-pages</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">mcelog</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">mcelog</packagereq>
      <packagereq variant="BaseOS">mdadm</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64,i686">microcode_ctl</packagereq>
+      <packagereq variant="BaseOS" arch="x86_64">microcode_ctl</packagereq>
      <packagereq variant="BaseOS">mlocate</packagereq>
      <packagereq variant="BaseOS">mtr</packagereq>
      <packagereq variant="BaseOS">net-tools</packagereq>
@@ -4076,7 +4076,7 @@
      <packagereq variant="AppStream">qt5-qtbase-gui</packagereq>
      <packagereq variant="AppStream">qt5-qtdeclarative</packagereq>
      <packagereq variant="AppStream">qt5-qtxmlpatterns</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64,i686">rhythmbox</packagereq>
+      <packagereq variant="AppStream" arch="ppc64le,x86_64">rhythmbox</packagereq>
      <packagereq variant="AppStream">setroubleshoot</packagereq>
      <packagereq variant="AppStream">telnet</packagereq>
      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
@@ -4140,11 +4140,11 @@
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq>nss-altfiles</packagereq>
-      <packagereq arch="aarch64,ppc64le,x86_64,i686">ostree-grub2</packagereq>
+      <packagereq arch="aarch64,ppc64le,x86_64">ostree-grub2</packagereq>
      <packagereq>rpm-ostree</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,ppc64le,s390x">
+  <group variant="AppStream" arch="x86_64,ppc64le,s390x,i686">
    <id>virtualization-tools</id>
    <name>Virtualization Tools</name>
    <name xml:lang="as">ভাৰছুৱেলাইজেষণৰ সঁজুলিসমূহ</name>
@@ -4214,11 +4214,11 @@
      <packagereq type="optional">libguestfs-tools</packagereq>
      <packagereq type="optional">libguestfs-tools-c</packagereq>
      <packagereq type="optional">libguestfs-inspect-icons</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">spice-qxl-wddm-dod</packagereq>
-      <packagereq type="default" arch="x86_64,i686">virtio-win</packagereq>
+      <packagereq type="optional" arch="x86_64">spice-qxl-wddm-dod</packagereq>
+      <packagereq type="default" arch="x86_64">virtio-win</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,s390x,ppc64le">
+  <group variant="AppStream" arch="x86_64,s390x,ppc64le,i686">
    <id>virtualization-platform</id>
    <name>Virtualization Platform</name>
    <name xml:lang="as">ভাৰছুৱেলাইজেষণ প্লেটফৰ্ম</name>
@@ -4285,14 +4285,14 @@
    <packagelist>
      <packagereq type="mandatory">libvirt</packagereq>
      <packagereq type="mandatory">libvirt-client</packagereq>
-      <packagereq type="mandatory" arch="x86_64,i686">virt-who</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">fence-virtd-libvirt</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">fence-virtd-multicast</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">fence-virtd-serial</packagereq>
+      <packagereq type="mandatory" arch="x86_64">virt-who</packagereq>
+      <packagereq type="optional" arch="x86_64">fence-virtd-libvirt</packagereq>
+      <packagereq type="optional" arch="x86_64">fence-virtd-multicast</packagereq>
+      <packagereq type="optional" arch="x86_64">fence-virtd-serial</packagereq>
      <packagereq type="optional">perl-Sys-Virt</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,s390x,ppc64le">
+  <group variant="AppStream" arch="x86_64,s390x,ppc64le,i686">
    <id>virtualization-hypervisor</id>
    <name>Virtualization Hypervisor</name>
    <name xml:lang="as">ভাৰছুৱেলাইজেষণ হাইপাৰভাইছৰ</name>
@@ -4351,11 +4351,11 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq type="mandatory" arch="x86_64,i686,ppc64le,s390x">libvirt</packagereq>
-      <packagereq type="mandatory" arch="x86_64,i686,ppc64le,s390x">qemu-kvm</packagereq>
+      <packagereq type="mandatory" arch="x86_64,ppc64le,s390x">libvirt</packagereq>
+      <packagereq type="mandatory" arch="x86_64,ppc64le,s390x">qemu-kvm</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="aarch64,x86_64,i686,s390x,ppc64le">
+  <group variant="AppStream" arch="aarch64,x86_64,s390x,ppc64le,i686">
    <id>virtualization-client</id>
    <name>Virtualization Client</name>
    <name xml:lang="as">ভাৰছুৱেলাইজেষণ ক্লাএন্ট</name>
@@ -4420,7 +4420,7 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq type="mandatory" arch="x86_64,i686">gnome-boxes</packagereq>
+      <packagereq type="mandatory" arch="x86_64">gnome-boxes</packagereq>
      <packagereq type="mandatory">virt-install</packagereq>
      <packagereq type="mandatory">virt-manager</packagereq>
      <packagereq type="mandatory">virt-viewer</packagereq>
@@ -4730,7 +4730,7 @@
      <packagereq type="default">pnm2ppa</packagereq>
      <packagereq type="default">system-config-printer-udev</packagereq>
      <packagereq type="optional">hplip</packagereq>
-      <packagereq type="optional" arch="aarch64,ppc64le,x86_64,i686">hplip-gui</packagereq>
+      <packagereq type="optional" arch="aarch64,ppc64le,x86_64">hplip-gui</packagereq>
    </packagelist>
  </group>
  <group variant="AppStream" arch="x86_64,i686">
@@ -5092,7 +5092,7 @@
      <packagereq type="optional">pavucontrol</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,ppc64le,aarch64">
+  <group variant="AppStream" arch="x86_64,ppc64le,aarch64,i686">
    <id>load-balancer</id>
    <name>Load Balancer</name>
    <name xml:lang="as">লোড ভাৰসাম্যক</name>
@@ -5572,8 +5572,8 @@
      <packagereq type="default">evolution-ews</packagereq>
      <packagereq type="default">evolution-help</packagereq>
      <packagereq type="default">evolution-mapi</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">hexchat</packagereq>
-      <packagereq type="optional" arch="ppc64le,x86_64,i686">pidgin</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">hexchat</packagereq>
+      <packagereq type="optional" arch="ppc64le,x86_64">pidgin</packagereq>
      <packagereq type="optional">thunderbird</packagereq>
    </packagelist>
  </group>
@@ -5658,7 +5658,7 @@
      <packagereq type="optional">ibus-table-array30</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,ppc64le,aarch64">
+  <group variant="AppStream" arch="x86_64,ppc64le,aarch64,i686">
    <id>identity-management-server</id>
    <name>Identity Management Server</name>
    <name xml:lang="as">পৰিচয় ব্যৱস্থাপনা চাৰ্ভাৰ</name>
@@ -5718,12 +5718,12 @@
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="default">ipa-admintools</packagereq>
-      <packagereq type="default" arch="x86_64,i686">ipa-server</packagereq>
+      <packagereq type="default" arch="x86_64">ipa-server</packagereq>
      <packagereq type="default">pki-ca</packagereq>
      <packagereq type="optional">bind-pkcs11</packagereq>
      <packagereq type="optional">bind-pkcs11-utils</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">ipa-server-dns</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">ipa-server-trust-ad</packagereq>
+      <packagereq type="optional" arch="x86_64">ipa-server-dns</packagereq>
+      <packagereq type="optional" arch="x86_64">ipa-server-trust-ad</packagereq>
      <packagereq type="optional">nuxwdog</packagereq>
    </packagelist>
  </group>
@@ -5821,14 +5821,14 @@
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
-      <packagereq arch="x86_64,i686">hyperv-daemons</packagereq>
-      <packagereq arch="x86_64,i686">open-vm-tools-desktop</packagereq>
+      <packagereq arch="x86_64">hyperv-daemons</packagereq>
+      <packagereq arch="x86_64">open-vm-tools-desktop</packagereq>
      <packagereq>qemu-guest-agent</packagereq>
      <packagereq>spice-vdagent</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">spice-streaming-agent</packagereq>
+      <packagereq type="optional" arch="x86_64">spice-streaming-agent</packagereq>
    </packagelist>
  </group>
-  <group variant="AppStream" arch="x86_64,i686,ppc64le,aarch64">
+  <group variant="AppStream" arch="x86_64,ppc64le,aarch64,i686">
    <id>graphics</id>
    <name>Graphics Creation Tools</name>
    <name xml:lang="as">গ্ৰাফিক্স নিৰ্মাণৰ বাবে ব্যৱহাৰযোগ্য সঁজুলিসমূহ</name>
@@ -6304,12 +6304,12 @@
      <packagereq variant="AppStream" type="default">perl-generators</packagereq>
      <packagereq variant="AppStream" type="default">perl-Fedora-VSP</packagereq>
      <packagereq variant="AppStream" type="default">perl-Sys-Syslog</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,x86_64,i686">pesign</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,x86_64">pesign</packagereq>
      <packagereq variant="AppStream" type="default">source-highlight</packagereq>
      <packagereq variant="AppStream" type="default">systemtap</packagereq>
      <packagereq variant="AppStream" type="default">jna</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686,s390x">valgrind</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,i686,s390x">valgrind-devel</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind-devel</packagereq>
      <packagereq variant="AppStream" type="optional">cmake</packagereq>
      <packagereq variant="BaseOS" type="optional">expect</packagereq>
      <packagereq variant="AppStream" type="optional">rpmdevtools</packagereq>
@@ -6442,9 +6442,9 @@
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
-      <packagereq type="optional" arch="x86_64,i686">dotnet-sdk-2.1</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">dotnet-sdk-3.1</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">dotnet-sdk-5.0</packagereq>
+      <packagereq type="optional" arch="x86_64">dotnet-sdk-2.1</packagereq>
+      <packagereq type="optional" arch="x86_64">dotnet-sdk-3.1</packagereq>
+      <packagereq type="optional" arch="x86_64">dotnet-sdk-5.0</packagereq>
    </packagelist>
  </group>
  <group variant="AppStream">
@@ -7580,7 +7580,7 @@
    <packagelist>
      <packagereq type="mandatory">amanda-client</packagereq>
      <packagereq type="optional">bacula-client</packagereq>
-      <packagereq type="optional" arch="x86_64,i686,ppc64le,aarch64">rear</packagereq>
+      <packagereq type="optional" arch="x86_64,ppc64le,aarch64">rear</packagereq>
    </packagelist>
  </group>
  <group>
@@ -7651,18 +7651,18 @@
      <packagereq type="mandatory">pacemaker-nagios-plugins-metadata</packagereq>
      <packagereq type="mandatory">pacemaker-remote</packagereq>
      <packagereq type="mandatory">pacemaker-cts</packagereq>
-      <packagereq type="default" arch="x86_64,i686">fence-agents-aliyun</packagereq>
+      <packagereq type="default" arch="x86_64">fence-agents-aliyun</packagereq>
      <packagereq type="default">fence-agents-all</packagereq>
      <packagereq type="default">fence-agents-azure-arm</packagereq>
      <packagereq type="default">fence-agents-gce</packagereq>
-      <packagereq type="default" arch="x86_64,i686">fence-agents-aws</packagereq>
+      <packagereq type="default" arch="x86_64">fence-agents-aws</packagereq>
      <packagereq type="default">omping</packagereq>
      <packagereq type="default">pacemaker-doc</packagereq>
      <packagereq type="default">pcs</packagereq>
      <packagereq type="optional">resource-agents</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">resource-agents-gcp</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">resource-agents-aliyun</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">awscli</packagereq>
+      <packagereq type="optional" arch="x86_64">resource-agents-gcp</packagereq>
+      <packagereq type="optional" arch="x86_64">resource-agents-aliyun</packagereq>
+      <packagereq type="optional" arch="x86_64">awscli</packagereq>
      <packagereq type="optional">booth</packagereq>
      <packagereq type="optional">booth-arbitrator</packagereq>
      <packagereq type="optional">booth-site</packagereq>
@@ -7774,8 +7774,8 @@
      <packagereq type="optional">cmirror</packagereq>
      <packagereq type="optional">ctdb</packagereq>
      <packagereq type="optional">resource-agents</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">resource-agents-gcp</packagereq>
-      <packagereq type="optional" arch="x86_64,i686">resource-agents-aliyun</packagereq>
+      <packagereq type="optional" arch="x86_64">resource-agents-gcp</packagereq>
+      <packagereq type="optional" arch="x86_64">resource-agents-aliyun</packagereq>
    </packagelist>
  </group>
  <group>
@@ -7832,7 +7832,7 @@
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="default">accountsservice-devel</packagereq>
-      <packagereq type="default" arch="x86_64,i686">accel-config-devel</packagereq>
+      <packagereq type="default" arch="x86_64">accel-config-devel</packagereq>
      <packagereq type="default">ant-junit</packagereq>
      <packagereq type="default">antlr-C++</packagereq>
      <packagereq type="default">antlr-tool</packagereq>
@@ -7941,10 +7941,10 @@
      <packagereq type="default">drpm-devel</packagereq>
      <packagereq type="default">dtc</packagereq>
      <packagereq type="default">dwarves</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">dyninst-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">dyninst-doc</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">dyninst-static</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">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>
@@ -7953,7 +7953,7 @@
      <packagereq type="default">elinks</packagereq>
      <packagereq type="default">enca</packagereq>
      <packagereq type="default">enca-devel</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">enchant2-devel</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">enchant2-devel</packagereq>
      <packagereq type="default">enchant-devel</packagereq>
      <packagereq type="default">evince-devel</packagereq>
      <packagereq type="default">evolution-data-server-doc</packagereq>
@@ -7984,16 +7984,16 @@
      <packagereq type="default">fuse-sshfs</packagereq>
      <packagereq type="default">gamin-devel</packagereq>
      <packagereq type="default">gcc-plugin-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">gcc-toolset-9-dyninst-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">gcc-toolset-9-dyninst-doc</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">gcc-toolset-9-dyninst-static</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">gcc-toolset-9-dyninst-testsuite</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">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>
      <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">gegl04-devel</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">gegl04-devel</packagereq>
      <packagereq type="default">geoclue2-devel</packagereq>
      <packagereq type="default">geronimo-jms</packagereq>
      <packagereq type="default">gflags</packagereq>
@@ -8030,11 +8030,11 @@
      <packagereq type="default">glusterfs-devel</packagereq>
      <packagereq type="default">gmock</packagereq>
      <packagereq type="default">gmock-devel</packagereq>
-      <packagereq type="default" arch="aarch64,x86_64,i686,ppc64le">gnome-bluetooth-libs-devel</packagereq>
+      <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
      <packagereq type="default">gnome-common</packagereq>
      <packagereq type="default">gnome-menus-devel</packagereq>
-      <packagereq type="default" arch="x86_64,i686,aarch64">gnu-efi</packagereq>
-      <packagereq type="default" arch="x86_64,i686,aarch64">gnu-efi-devel</packagereq>
+      <packagereq type="default" arch="x86_64,aarch64">gnu-efi</packagereq>
+      <packagereq type="default" arch="x86_64,aarch64">gnu-efi-devel</packagereq>
      <packagereq type="default">gnuplot-doc</packagereq>
      <packagereq type="default">gobject-introspection-devel</packagereq>
      <packagereq type="default">go-compilers-golang-compiler</packagereq>
@@ -8082,7 +8082,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,i686">intel-cmt-cat-devel</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>
@@ -8104,7 +8104,7 @@
      <packagereq type="default">junit</packagereq>
      <packagereq type="default">jvnet-parent</packagereq>
      <packagereq type="default">jzlib</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">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>
@@ -8210,7 +8210,7 @@
      <packagereq type="default">libIDL-devel</packagereq>
      <packagereq type="default">libidn2-devel</packagereq>
      <packagereq type="default">libidn-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">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>
@@ -8261,16 +8261,16 @@
      <packagereq type="default">libpeas-devel</packagereq>
      <packagereq type="default">libpfm-static</packagereq>
      <packagereq type="default">libplist-devel</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libpmem-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libpmemblk-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libpmemlog-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libpmemobj-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libpmempool-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">librpmem-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libvmem-debug</packagereq>
-      <packagereq type="default" arch="x86_64,i686">libvmmalloc-debug</packagereq>
+      <packagereq type="default" arch="x86_64">libpmem-debug</packagereq>
+      <packagereq type="default" arch="x86_64">libpmemblk-debug</packagereq>
+      <packagereq type="default" arch="x86_64">libpmemlog-debug</packagereq>
+      <packagereq type="default" arch="x86_64">libpmemobj-debug</packagereq>
+      <packagereq type="default" arch="x86_64">libpmempool-debug</packagereq>
+      <packagereq type="default" arch="x86_64">librpmem-debug</packagereq>
+      <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" arch="x86_64,i686">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>
@@ -8282,13 +8282,13 @@
      <packagereq type="default">librados-devel</packagereq>
      <packagereq type="default">libradosstriper1</packagereq>
      <packagereq type="default">libradosstriper-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">libraw1394-devel</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">LibRaw-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>
      <packagereq type="default">libref_array-devel</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">libreoffice-sdk</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">libreoffice-sdk-doc</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">libreoffice-sdk</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">libreoffice-sdk-doc</packagereq>
      <packagereq type="default">librevenge-devel</packagereq>
      <packagereq type="default">librx</packagereq>
      <packagereq type="default">librx-devel</packagereq>
@@ -8409,7 +8409,7 @@
      <packagereq type="default">maven-surefire-provider-junit</packagereq>
      <packagereq type="default">maven-surefire-provider-testng</packagereq>
      <packagereq type="default">maven-verifier</packagereq>
-      <packagereq type="default" arch="x86_64,i686">memkind-devel</packagereq>
+      <packagereq type="default" arch="x86_64">memkind-devel</packagereq>
      <packagereq type="default">mesa-libgbm-devel</packagereq>
      <packagereq type="default">mesa-libGLES-devel</packagereq>
      <packagereq type="default">mesa-libOSMesa-devel</packagereq>
@@ -8417,93 +8417,93 @@
      <packagereq type="default">metis</packagereq>
      <packagereq type="default">metis-devel</packagereq>
      <packagereq type="default">mingw32-binutils</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-bzip2</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-bzip2-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-cairo</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw32-expat</packagereq>
+      <packagereq type="default" arch="x86_64">mingw32-expat</packagereq>
      <packagereq type="default">mingw32-filesystem</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-fontconfig</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-freetype</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-freetype-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-gcc</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-gcc-c++</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-gettext</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-gettext-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-glib2</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-glib2-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-gstreamer1</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-harfbuzz</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw32-icu</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libffi</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libjpeg-turbo</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libjpeg-turbo-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libpng</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libpng-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libtiff</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-libtiff-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-openssl</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-pcre</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-pcre-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-pixman</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-pkg-config</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-readline</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-sqlite</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-sqlite-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-termcap</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw32-win-iconv</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw32-zlib</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw64-bzip2</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-bzip2-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-cairo</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw64-expat</packagereq>
+      <packagereq type="default" arch="x86_64">mingw64-expat</packagereq>
      <packagereq type="default">mingw64-filesystem</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-fontconfig</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-freetype</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-freetype-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-gcc</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-gcc-c++</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-gettext</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-gettext-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-glib2</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-glib2-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-gstreamer1</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-harfbuzz</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw64-icu</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libffi</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libjpeg-turbo</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libjpeg-turbo-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libpng</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libpng-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libtiff</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-libtiff-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-openssl</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-pcre</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-pcre-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-pixman</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-pkg-config</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-readline</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-sqlite</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-sqlite-static</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-termcap</packagereq>
-      <packagereq type="default" arch="x86_64,i686">mingw64-win-iconv</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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" arch="x86_64,i686">mingw64-zlib</packagereq>
-      <packagereq type="default" arch="x86_64,i686">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>
@@ -8580,7 +8580,7 @@
      <packagereq type="default">pandoc</packagereq>
      <packagereq type="default">pangomm-devel</packagereq>
      <packagereq type="default">pangomm-doc</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64,i686">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>
@@ -8721,7 +8721,7 @@
      <packagereq type="default">perl-YAML-LibYAML</packagereq>
      <packagereq type="default">perl-YAML-Syck</packagereq>
      <packagereq type="default">perl-YAML-Tiny</packagereq>
-      <packagereq type="default" arch="ppc64le,x86_64,i686">pidgin-devel</packagereq>
+      <packagereq type="default" arch="ppc64le,x86_64">pidgin-devel</packagereq>
      <packagereq type="default">plexus-archiver</packagereq>
      <packagereq type="default">plexus-build-api</packagereq>
      <packagereq type="default">plexus-compiler</packagereq>
@@ -8792,7 +8792,7 @@
      <packagereq type="default">python3-webencodings</packagereq>
      <packagereq type="default">python3-whoosh</packagereq>
      <packagereq type="default">python-sphinx-locale</packagereq>
-      <packagereq type="default" arch="x86_64,i686">qatlib-devel</packagereq>
+      <packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
      <packagereq type="default">qdox</packagereq>
      <packagereq type="default">qgpgme-devel</packagereq>
      <packagereq type="default">qhull-devel</packagereq>
@@ -8835,7 +8835,7 @@
      <packagereq type="default">sendmail-milter-devel</packagereq>
      <packagereq type="default">sg3_utils-devel</packagereq>
      <packagereq type="default">sharutils</packagereq>
-      <packagereq type="default" arch="x86_64,i686">shim-unsigned-x64</packagereq>
+      <packagereq type="default" arch="x86_64">shim-unsigned-x64</packagereq>
      <packagereq type="default" arch="aarch64">shim-unsigned-aarch64</packagereq>
      <packagereq type="default">snappy-devel</packagereq>
      <packagereq type="default">socket_wrapper</packagereq>
@@ -8847,7 +8847,7 @@
      <packagereq type="default">speech-dispatcher-doc</packagereq>
      <packagereq type="default">speex-devel</packagereq>
      <packagereq type="default">speexdsp-devel</packagereq>
-      <packagereq type="default" arch="aarch64,x86_64,i686">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>
@@ -9404,7 +9404,7 @@
      <groupid>virtualization-hypervisor</groupid>
    </optionlist>
  </environment>
-  <environment variant="AppStream" arch="x86_64,i686,ppc64le">
+  <environment variant="AppStream" arch="x86_64,ppc64le,i686">
    <id>developer-workstation-environment</id>
    <name>Development and Creative Workstation</name>
    <name xml:lang="as">উন্নয়ন আৰু সৃজনশীল ৱাৰ্কস্টেশন</name>
@@ -9515,7 +9515,7 @@
      <groupid>remote-desktop-clients</groupid>
    </optionlist>
  </environment>
-  <environment variant="AppStream" arch="x86_64,i686,ppc64le">
+  <environment variant="AppStream" arch="x86_64,ppc64le,i686">
    <id>gnome-desktop-environment</id>
    <name>GNOME Desktop</name>
    <name xml:lang="as">GNOME ডেস্কটপ</name>
@@ -9584,7 +9584,7 @@
      <groupid>remote-desktop-clients</groupid>
    </optionlist>
  </environment>
-  <environment variant="AppStream" arch="x86_64,i686,ppc64le">
+  <environment variant="AppStream" arch="x86_64,ppc64le,i686">
    <id>workstation-product-environment</id>
    <name>Workstation</name>
    <name xml:lang="de">Arbeitsplatz</name>
@@ -10123,7 +10123,7 @@
      <groupid>scientific</groupid>
    </grouplist>
  </category>
-  <category arch="aarch64,s390x,ppc64le,x86_64,i686">
+  <category arch="aarch64,s390x,ppc64le,x86_64">
    <id>desktops</id>
    <name>Desktops</name>
    <name xml:lang="af">Werkskerms</name>