remove i686 and update comps

comps/AppStream-aarch64.xml

@@ -363,6 +363,10 @@
       <packagereq type="default">redhat-display-vf-fonts</packagereq>
       <packagereq type="default">redhat-mono-vf-fonts</packagereq>
       <packagereq type="default">redhat-text-vf-fonts</packagereq>
+      <packagereq type="optional">default-fonts</packagereq>
+      <packagereq type="optional">default-fonts-cjk</packagereq>
+      <packagereq type="optional">default-fonts-core</packagereq>
+      <packagereq type="optional">default-fonts-other</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">google-arimo-fonts</packagereq>
       <packagereq type="optional">google-carlito-fonts</packagereq>
@@ -373,6 +377,7 @@
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
       <packagereq type="optional">google-noto-fonts-all</packagereq>
+      <packagereq type="optional">google-roboto-slab-fonts</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
@@ -418,13 +423,12 @@
       <packagereq type="mandatory">at-spi2-core</packagereq>
       <packagereq type="mandatory">avahi-tools</packagereq>
       <packagereq type="mandatory">baobab</packagereq>
-      <packagereq type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">evince</packagereq>
       <packagereq type="mandatory">evince-nautilus</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gedit</packagereq>
       <packagereq type="mandatory">gnome-bluetooth</packagereq>
+      <packagereq type="mandatory">gnome-browser-connector</packagereq>
       <packagereq type="mandatory">gnome-calculator</packagereq>
       <packagereq type="mandatory">gnome-characters</packagereq>
       <packagereq type="mandatory">gnome-classic-session</packagereq>
@@ -434,7 +438,6 @@
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
       <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq type="mandatory">gnome-screenshot</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
       <packagereq type="mandatory">gnome-settings-daemon</packagereq>
@@ -444,6 +447,7 @@
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">gvfs-goa</packagereq>
@@ -457,17 +461,13 @@
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="mandatory">sushi</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gtk</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="mandatory">yelp-tools</packagereq>
-      <packagereq type="optional">gedit-plugins</packagereq>
-      <packagereq type="optional">gnome-backgrounds</packagereq>
       <packagereq type="optional">gnome-shell-extension-apps-menu</packagereq>
       <packagereq type="optional">gnome-shell-extension-auto-move-windows</packagereq>
       <packagereq type="optional">gnome-shell-extension-dash-to-dock</packagereq>
@@ -593,30 +593,6 @@
       <packagereq requires="gtk3" type="conditional">ibus-gtk3</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>internet-applications</id>
-    <name>Internet Applications</name>
-    <description>Email, chat, and video conferencing software.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">evolution</packagereq>
-      <packagereq type="default">evolution-ews</packagereq>
-      <packagereq type="default">evolution-help</packagereq>
-      <packagereq type="default">evolution-mapi</packagereq>
-      <packagereq type="optional">thunderbird</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>internet-browser</id>
-    <name>Internet Browser</name>
-    <description>The Firefox web browser</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">firefox</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>java-development</id>
     <name>Java Development</name>
@@ -1689,7 +1665,6 @@
     <grouplist>
       <groupid>emacs</groupid>
       <groupid>graphics</groupid>
-      <groupid>internet-applications</groupid>
     </grouplist>
   </category>
   <environment>
@@ -1707,7 +1682,6 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>

comps/AppStream-ppc64le.xml

@@ -356,6 +356,10 @@
       <packagereq type="default">redhat-display-vf-fonts</packagereq>
       <packagereq type="default">redhat-mono-vf-fonts</packagereq>
       <packagereq type="default">redhat-text-vf-fonts</packagereq>
+      <packagereq type="optional">default-fonts</packagereq>
+      <packagereq type="optional">default-fonts-cjk</packagereq>
+      <packagereq type="optional">default-fonts-core</packagereq>
+      <packagereq type="optional">default-fonts-other</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">google-arimo-fonts</packagereq>
       <packagereq type="optional">google-carlito-fonts</packagereq>
@@ -366,6 +370,7 @@
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
       <packagereq type="optional">google-noto-fonts-all</packagereq>
+      <packagereq type="optional">google-roboto-slab-fonts</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
@@ -422,16 +427,13 @@
       <packagereq type="mandatory">at-spi2-core</packagereq>
       <packagereq type="mandatory">avahi-tools</packagereq>
       <packagereq type="mandatory">baobab</packagereq>
-      <packagereq type="mandatory">cheese</packagereq>
-      <packagereq type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
-      <packagereq type="mandatory">eog</packagereq>
       <packagereq type="mandatory">evince</packagereq>
       <packagereq type="mandatory">evince-nautilus</packagereq>
       <packagereq type="mandatory">fprintd-pam</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gedit</packagereq>
       <packagereq type="mandatory">gnome-bluetooth</packagereq>
+      <packagereq type="mandatory">gnome-browser-connector</packagereq>
       <packagereq type="mandatory">gnome-calculator</packagereq>
       <packagereq type="mandatory">gnome-characters</packagereq>
       <packagereq type="mandatory">gnome-classic-session</packagereq>
@@ -442,7 +444,6 @@
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
       <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq type="mandatory">gnome-screenshot</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
       <packagereq type="mandatory">gnome-settings-daemon</packagereq>
@@ -452,6 +453,7 @@
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">gvfs-goa</packagereq>
@@ -461,22 +463,19 @@
       <packagereq type="mandatory">libcanberra-gtk3</packagereq>
       <packagereq type="mandatory">librsvg2</packagereq>
       <packagereq type="mandatory">libsane-hpaio</packagereq>
+      <packagereq type="mandatory">loupe</packagereq>
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="mandatory">sushi</packagereq>
+      <packagereq type="mandatory">snapshot</packagereq>
-      <packagereq type="mandatory">totem</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gtk</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="mandatory">yelp-tools</packagereq>
-      <packagereq type="optional">gedit-plugins</packagereq>
-      <packagereq type="optional">gnome-backgrounds</packagereq>
       <packagereq type="optional">gnome-shell-extension-apps-menu</packagereq>
       <packagereq type="optional">gnome-shell-extension-auto-move-windows</packagereq>
       <packagereq type="optional">gnome-shell-extension-dash-to-dock</packagereq>
@@ -598,31 +597,6 @@
       <packagereq requires="gtk3" type="conditional">ibus-gtk3</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>internet-applications</id>
-    <name>Internet Applications</name>
-    <description>Email, chat, and video conferencing software.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">evolution</packagereq>
-      <packagereq type="default">evolution-ews</packagereq>
-      <packagereq type="default">evolution-help</packagereq>
-      <packagereq type="default">evolution-mapi</packagereq>
-      <packagereq type="default">hexchat</packagereq>
-      <packagereq type="optional">thunderbird</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>internet-browser</id>
-    <name>Internet Browser</name>
-    <description>The Firefox web browser</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">firefox</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>java-development</id>
     <name>Java Development</name>
@@ -1661,7 +1635,6 @@
       <groupid>emacs</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
-      <groupid>internet-applications</groupid>
     </grouplist>
   </category>
   <environment>
@@ -1679,7 +1652,6 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
@@ -1748,7 +1720,6 @@
       <groupid>gnome-desktop</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
@@ -1759,7 +1730,6 @@
       <groupid>backup-client</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-applications</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
     </optionlist>

comps/AppStream-s390x.xml

@@ -368,6 +368,10 @@
       <packagereq type="default">redhat-display-vf-fonts</packagereq>
       <packagereq type="default">redhat-mono-vf-fonts</packagereq>
       <packagereq type="default">redhat-text-vf-fonts</packagereq>
+      <packagereq type="optional">default-fonts</packagereq>
+      <packagereq type="optional">default-fonts-cjk</packagereq>
+      <packagereq type="optional">default-fonts-core</packagereq>
+      <packagereq type="optional">default-fonts-other</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">google-arimo-fonts</packagereq>
       <packagereq type="optional">google-carlito-fonts</packagereq>
@@ -378,6 +382,7 @@
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
       <packagereq type="optional">google-noto-fonts-all</packagereq>
+      <packagereq type="optional">google-roboto-slab-fonts</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
@@ -423,12 +428,11 @@
       <packagereq type="mandatory">at-spi2-core</packagereq>
       <packagereq type="mandatory">avahi-tools</packagereq>
       <packagereq type="mandatory">baobab</packagereq>
-      <packagereq type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">evince</packagereq>
       <packagereq type="mandatory">evince-nautilus</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gedit</packagereq>
+      <packagereq type="mandatory">gnome-browser-connector</packagereq>
       <packagereq type="mandatory">gnome-calculator</packagereq>
       <packagereq type="mandatory">gnome-characters</packagereq>
       <packagereq type="mandatory">gnome-classic-session</packagereq>
@@ -438,7 +442,6 @@
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
       <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq type="mandatory">gnome-screenshot</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
       <packagereq type="mandatory">gnome-settings-daemon</packagereq>
@@ -448,6 +451,7 @@
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">gvfs-goa</packagereq>
@@ -461,17 +465,13 @@
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="mandatory">sushi</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gtk</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="mandatory">yelp-tools</packagereq>
-      <packagereq type="optional">gedit-plugins</packagereq>
-      <packagereq type="optional">gnome-backgrounds</packagereq>
       <packagereq type="optional">gnome-shell-extension-apps-menu</packagereq>
       <packagereq type="optional">gnome-shell-extension-auto-move-windows</packagereq>
       <packagereq type="optional">gnome-shell-extension-dash-to-dock</packagereq>
@@ -557,30 +557,6 @@
       <packagereq requires="gtk3" type="conditional">ibus-gtk3</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>internet-applications</id>
-    <name>Internet Applications</name>
-    <description>Email, chat, and video conferencing software.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">evolution</packagereq>
-      <packagereq type="default">evolution-ews</packagereq>
-      <packagereq type="default">evolution-help</packagereq>
-      <packagereq type="default">evolution-mapi</packagereq>
-      <packagereq type="optional">thunderbird</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>internet-browser</id>
-    <name>Internet Browser</name>
-    <description>The Firefox web browser</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">firefox</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>java-development</id>
     <name>Java Development</name>
@@ -1620,7 +1596,6 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid>internet-applications</groupid>
     </grouplist>
   </category>
   <environment>
@@ -1638,7 +1613,6 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
       <groupid>server-product</groupid>

comps/AppStream-x86_64.xml

@@ -373,6 +373,10 @@
       <packagereq type="default">redhat-display-vf-fonts</packagereq>
       <packagereq type="default">redhat-mono-vf-fonts</packagereq>
       <packagereq type="default">redhat-text-vf-fonts</packagereq>
+      <packagereq type="optional">default-fonts</packagereq>
+      <packagereq type="optional">default-fonts-cjk</packagereq>
+      <packagereq type="optional">default-fonts-core</packagereq>
+      <packagereq type="optional">default-fonts-other</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">google-arimo-fonts</packagereq>
       <packagereq type="optional">google-carlito-fonts</packagereq>
@@ -383,6 +387,7 @@
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
       <packagereq type="optional">google-noto-fonts-all</packagereq>
+      <packagereq type="optional">google-roboto-slab-fonts</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
@@ -439,16 +444,13 @@
       <packagereq type="mandatory">at-spi2-core</packagereq>
       <packagereq type="mandatory">avahi-tools</packagereq>
       <packagereq type="mandatory">baobab</packagereq>
-      <packagereq type="mandatory">cheese</packagereq>
-      <packagereq type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
-      <packagereq type="mandatory">eog</packagereq>
       <packagereq type="mandatory">evince</packagereq>
       <packagereq type="mandatory">evince-nautilus</packagereq>
       <packagereq type="mandatory">fprintd-pam</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gedit</packagereq>
       <packagereq type="mandatory">gnome-bluetooth</packagereq>
+      <packagereq type="mandatory">gnome-browser-connector</packagereq>
       <packagereq type="mandatory">gnome-calculator</packagereq>
       <packagereq type="mandatory">gnome-characters</packagereq>
       <packagereq type="mandatory">gnome-classic-session</packagereq>
@@ -459,7 +461,6 @@
       <packagereq type="mandatory">gnome-initial-setup</packagereq>
       <packagereq type="mandatory">gnome-logs</packagereq>
       <packagereq type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq type="mandatory">gnome-screenshot</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
       <packagereq type="mandatory">gnome-settings-daemon</packagereq>
@@ -469,6 +470,7 @@
       <packagereq type="mandatory">gnome-system-monitor</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-user-docs</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">gvfs-goa</packagereq>
@@ -478,22 +480,19 @@
       <packagereq type="mandatory">libcanberra-gtk3</packagereq>
       <packagereq type="mandatory">librsvg2</packagereq>
       <packagereq type="mandatory">libsane-hpaio</packagereq>
+      <packagereq type="mandatory">loupe</packagereq>
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">orca</packagereq>
       <packagereq type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="mandatory">sushi</packagereq>
+      <packagereq type="mandatory">snapshot</packagereq>
-      <packagereq type="mandatory">totem</packagereq>
       <packagereq type="mandatory">tracker</packagereq>
       <packagereq type="mandatory">tracker-miners</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="mandatory">xdg-desktop-portal-gtk</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="mandatory">yelp-tools</packagereq>
-      <packagereq type="optional">gedit-plugins</packagereq>
-      <packagereq type="optional">gnome-backgrounds</packagereq>
       <packagereq type="optional">gnome-shell-extension-apps-menu</packagereq>
       <packagereq type="optional">gnome-shell-extension-auto-move-windows</packagereq>
       <packagereq type="optional">gnome-shell-extension-dash-to-dock</packagereq>
@@ -619,31 +618,6 @@
       <packagereq requires="gtk3" type="conditional">ibus-gtk3</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>internet-applications</id>
-    <name>Internet Applications</name>
-    <description>Email, chat, and video conferencing software.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">evolution</packagereq>
-      <packagereq type="default">evolution-ews</packagereq>
-      <packagereq type="default">evolution-help</packagereq>
-      <packagereq type="default">evolution-mapi</packagereq>
-      <packagereq type="default">hexchat</packagereq>
-      <packagereq type="optional">thunderbird</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>internet-browser</id>
-    <name>Internet Browser</name>
-    <description>The Firefox web browser</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">firefox</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>java-development</id>
     <name>Java Development</name>
@@ -825,26 +799,6 @@
       <packagereq type="default">dnsmasq</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>office-suite</id>
-    <name>Office Suite and Productivity</name>
-    <description>A full-purpose office suite, and other productivity tools.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">libreoffice-calc</packagereq>
-      <packagereq type="default">libreoffice-draw</packagereq>
-      <packagereq type="default">libreoffice-emailmerge</packagereq>
-      <packagereq type="default">libreoffice-graphicfilter</packagereq>
-      <packagereq type="default">libreoffice-impress</packagereq>
-      <packagereq type="default">libreoffice-math</packagereq>
-      <packagereq type="default">libreoffice-writer</packagereq>
-      <packagereq type="optional">libreoffice-base</packagereq>
-      <packagereq type="optional">libreoffice-ogltrans</packagereq>
-      <packagereq type="optional">libreoffice-pyuno</packagereq>
-      <packagereq type="optional">libreoffice-wiki-publisher</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>ostree-support</id>
     <name>Image based rpm-ostree support</name>
@@ -1762,8 +1716,6 @@
       <groupid>emacs</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
     </grouplist>
   </category>
   <environment>
@@ -1781,7 +1733,6 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
@@ -1871,7 +1822,6 @@
       <groupid>gnome-desktop</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
-      <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
@@ -1882,8 +1832,6 @@
       <groupid>backup-client</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
     </optionlist>

comps/CRB-aarch64.xml

@@ -137,7 +137,6 @@
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
       <packagereq type="default">evolution-data-server-tests</packagereq>
-      <packagereq type="default">evolution-devel</packagereq>
       <packagereq type="default">execstack</packagereq>
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
@@ -205,9 +204,8 @@
       <packagereq type="default">gnu-efi-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-jp-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-cjk-fonts</packagereq>
       <packagereq type="default">google-noto-sans-symbols2-fonts</packagereq>
-      <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gperf</packagereq>
       <packagereq type="default">gpgme-devel</packagereq>
       <packagereq type="default">gpgmepp-devel</packagereq>
@@ -225,7 +223,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtkmm30-devel</packagereq>
       <packagereq type="default">gtkmm30-doc</packagereq>
-      <packagereq type="default">gtksourceview4-devel</packagereq>
       <packagereq type="default">gtkspell3-devel</packagereq>
       <packagereq type="default">hamcrest</packagereq>
       <packagereq type="default">hamcrest-core</packagereq>

comps/CRB-ppc64le.xml

@@ -137,7 +137,6 @@
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
       <packagereq type="default">evolution-data-server-tests</packagereq>
-      <packagereq type="default">evolution-devel</packagereq>
       <packagereq type="default">execstack</packagereq>
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
@@ -204,9 +203,8 @@
       <packagereq type="default">gnome-software-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-jp-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-cjk-fonts</packagereq>
       <packagereq type="default">google-noto-sans-symbols2-fonts</packagereq>
-      <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gperf</packagereq>
       <packagereq type="default">gpgme-devel</packagereq>
       <packagereq type="default">gpgmepp-devel</packagereq>
@@ -224,7 +222,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtkmm30-devel</packagereq>
       <packagereq type="default">gtkmm30-doc</packagereq>
-      <packagereq type="default">gtksourceview4-devel</packagereq>
       <packagereq type="default">gtkspell3-devel</packagereq>
       <packagereq type="default">hamcrest</packagereq>
       <packagereq type="default">hamcrest-core</packagereq>
@@ -427,8 +424,6 @@
       <packagereq type="default">librdkafka-devel</packagereq>
       <packagereq type="default">libref_array-devel</packagereq>
       <packagereq type="default">librelp-devel</packagereq>
-      <packagereq type="default">libreoffice-sdk</packagereq>
-      <packagereq type="default">libreoffice-sdk-doc</packagereq>
       <packagereq type="default">librepo-devel</packagereq>
       <packagereq type="default">librevenge-devel</packagereq>
       <packagereq type="default">librhsm-devel</packagereq>

comps/CRB-s390x.xml

@@ -133,7 +133,6 @@
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
       <packagereq type="default">evolution-data-server-tests</packagereq>
-      <packagereq type="default">evolution-devel</packagereq>
       <packagereq type="default">execstack</packagereq>
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
@@ -198,9 +197,8 @@
       <packagereq type="default">gnome-software-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-jp-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-cjk-fonts</packagereq>
       <packagereq type="default">google-noto-sans-symbols2-fonts</packagereq>
-      <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gperf</packagereq>
       <packagereq type="default">gpgme-devel</packagereq>
       <packagereq type="default">gpgmepp-devel</packagereq>
@@ -218,7 +216,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtkmm30-devel</packagereq>
       <packagereq type="default">gtkmm30-doc</packagereq>
-      <packagereq type="default">gtksourceview4-devel</packagereq>
       <packagereq type="default">gtkspell3-devel</packagereq>
       <packagereq type="default">hamcrest</packagereq>
       <packagereq type="default">hamcrest-core</packagereq>

comps/CRB-x86_64.xml

@@ -140,7 +140,6 @@
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
       <packagereq type="default">evolution-data-server-tests</packagereq>
-      <packagereq type="default">evolution-devel</packagereq>
       <packagereq type="default">execstack</packagereq>
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
@@ -209,9 +208,8 @@
       <packagereq type="default">gnu-efi-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-jp-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-cjk-fonts</packagereq>
       <packagereq type="default">google-noto-sans-symbols2-fonts</packagereq>
-      <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gperf</packagereq>
       <packagereq type="default">gpgme-devel</packagereq>
       <packagereq type="default">gpgmepp-devel</packagereq>
@@ -229,7 +227,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtkmm30-devel</packagereq>
       <packagereq type="default">gtkmm30-doc</packagereq>
-      <packagereq type="default">gtksourceview4-devel</packagereq>
       <packagereq type="default">gtkspell3-devel</packagereq>
       <packagereq type="default">hamcrest</packagereq>
       <packagereq type="default">hamcrest-core</packagereq>
@@ -444,8 +441,6 @@
       <packagereq type="default">librdkafka-devel</packagereq>
       <packagereq type="default">libref_array-devel</packagereq>
       <packagereq type="default">librelp-devel</packagereq>
-      <packagereq type="default">libreoffice-sdk</packagereq>
-      <packagereq type="default">libreoffice-sdk-doc</packagereq>
       <packagereq type="default">librepo-devel</packagereq>
       <packagereq type="default">librevenge-devel</packagereq>
       <packagereq type="default">librhsm-devel</packagereq>

hidden.cfg

@@ -2643,10 +2643,8 @@ package {
     include_filter: "mvapich2.aarch64"
     include_filter: "mvapich2-devel.ppc64le"
     include_filter: "mvapich2.ppc64le"
-    include_filter: "mvapich2-devel.i686"
     include_filter: "mvapich2-devel.x86_64"
     include_filter: "mvapich2-psm2.x86_64"
-    include_filter: "mvapich2.i686"
     include_filter: "mvapich2.x86_64"
   }
 }
@@ -4172,9 +4170,7 @@ package {
     include_filter: "SDL2_ttf.aarch64"
     include_filter: "SDL2_ttf.ppc64le"
     include_filter: "SDL2_ttf.s390x"
-    include_filter: "SDL2_ttf.i686"
     include_filter: "SDL2_ttf.x86_64"
-    multilib: "x86_64"
   }
 }
 package {
@@ -4185,9 +4181,7 @@ package {
     include_filter: "cjson.aarch64"
     include_filter: "cjson.ppc64le"
     include_filter: "cjson.s390x"
-    include_filter: "cjson.i686"
     include_filter: "cjson.x86_64"
-    multilib: "x86_64"
   }
 }
 package {
@@ -4198,9 +4192,7 @@ package {
     include_filter: "uriparser.aarch64"
     include_filter: "uriparser.ppc64le"
     include_filter: "uriparser.s390x"
-    include_filter: "uriparser.i686"
     include_filter: "uriparser.x86_64"
-    multilib: "x86_64"
   }
 }
 package {
@@ -4225,11 +4217,8 @@ package {
     include_filter: "libwinpr2.ppc64le"
     include_filter: "freerdp2-libs.s390x"
     include_filter: "libwinpr2.s390x"
-    include_filter: "freerdp2-libs.i686"
     include_filter: "freerdp2-libs.x86_64"
-    include_filter: "libwinpr2.i686"
     include_filter: "libwinpr2.x86_64"
-    multilib: "x86_64"
   }
 }
 package {
@@ -4240,14 +4229,11 @@ package {
     include_filter: "mozjs115.aarch64"
     include_filter: "mozjs115.ppc64le"
     include_filter: "mozjs115.s390x"
-    include_filter: "mozjs115.i686"
     include_filter: "mozjs115.x86_64"
     include_filter: "mozjs115-devel.aarch64"
     include_filter: "mozjs115-devel.ppc64le"
     include_filter: "mozjs115-devel.s390x"
-    include_filter: "mozjs115-devel.i686"
     include_filter: "mozjs115-devel.x86_64"
-    multilib: "x86_64"
   }
 }
 package {
@@ -4259,13 +4245,10 @@ package {
     include_filter: "python3-nispor.noarch"
     include_filter: "nispor.ppc64le"
     include_filter: "nispor.s390x"
-    include_filter: "nispor.i686"
     include_filter: "nispor.x86_64"
     include_filter: "nispor-devel.aarch64"
     include_filter: "nispor-devel.ppc64le"
     include_filter: "nispor-devel.s390x"
-    include_filter: "nispor-devel.i686"
     include_filter: "nispor-devel.x86_64"
-    multilib: "x86_64"
   }
 }