From 49dcfe86b4f87fcccd683a534479c8815e513608 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Sat, 10 Nov 2018 09:09:45 -0600
Subject: [PATCH] gnome-desktop: Add type to each package

These choices are fairly arbitrary.
---
 comps-f30.xml.in | 161 +++++++++++++++++++++++------------------------
 1 file changed, 80 insertions(+), 81 deletions(-)

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index a2325988..cc58fb94 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -2831,91 +2831,89 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>at-spi2-atk</packagereq>
-      <packagereq>at-spi2-core</packagereq>
-      <packagereq>avahi</packagereq>
-      <packagereq>baobab</packagereq>
-      <packagereq>cheese</packagereq>
-      <packagereq>chrome-gnome-shell</packagereq>
-      <packagereq>eog</packagereq>
-      <!-- <packagereq>epiphany</packagereq> -->
-      <packagereq>evince</packagereq>
-      <packagereq>evince-djvu</packagereq>
-      <packagereq>evince-nautilus</packagereq>
-      <packagereq>file-roller</packagereq>
-      <packagereq>file-roller-nautilus</packagereq>
-      <packagereq>fprintd-pam</packagereq>
-      <packagereq>gdm</packagereq>
-      <packagereq>glib-networking</packagereq>
-      <packagereq>gnome-backgrounds</packagereq>
-      <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-calculator</packagereq>
-      <packagereq>gnome-calendar</packagereq>
-      <packagereq>gnome-characters</packagereq>
-      <packagereq>gnome-classic-session</packagereq>
-      <packagereq>gnome-clocks</packagereq>
-      <packagereq>gnome-color-manager</packagereq>
-      <packagereq>gnome-contacts</packagereq>
-      <packagereq>gnome-disk-utility</packagereq>
-      <packagereq>gnome-documents</packagereq>
-      <packagereq>gnome-font-viewer</packagereq>
-      <packagereq>gnome-getting-started-docs</packagereq>
-      <packagereq>gnome-initial-setup</packagereq>
-      <packagereq>gnome-logs</packagereq>
-      <packagereq>gnome-maps</packagereq>
-      <packagereq>gnome-photos</packagereq>
-      <packagereq>gnome-remote-desktop</packagereq>
-      <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal-nautilus</packagereq>
-      <packagereq>gnome-themes-extra</packagereq>
-      <packagereq>gnome-user-docs</packagereq>
-      <packagereq>gnome-user-share</packagereq>
-      <packagereq>gnome-weather</packagereq>
-      <packagereq>gvfs-afc</packagereq>
-      <packagereq>gvfs-afp</packagereq>
-      <packagereq>gvfs-archive</packagereq>
-      <packagereq>gvfs-fuse</packagereq>
-      <packagereq>gvfs-goa</packagereq>
-      <packagereq>gvfs-gphoto2</packagereq>
-      <packagereq>gvfs-mtp</packagereq>
-      <packagereq>gvfs-smb</packagereq>
-      <packagereq>libcanberra-gtk2</packagereq>
-      <packagereq>libcanberra-gtk3</packagereq>
-      <packagereq>libproxy-mozjs</packagereq>
-      <packagereq>librsvg2</packagereq>
-      <packagereq>libsane-hpaio</packagereq>
-      <packagereq>mesa-libEGL</packagereq>
-      <packagereq>ModemManager</packagereq>
-      <packagereq>mousetweaks</packagereq>
-      <packagereq>nautilus-sendto</packagereq>
-      <packagereq>NetworkManager-adsl</packagereq>
-      <packagereq>NetworkManager-openconnect-gnome</packagereq>
-      <packagereq>NetworkManager-openvpn-gnome</packagereq>
-      <packagereq>NetworkManager-ppp</packagereq>
-      <packagereq>NetworkManager-pptp-gnome</packagereq>
-      <packagereq>NetworkManager-ssh-gnome</packagereq>
-      <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>NetworkManager-wwan</packagereq>
-      <packagereq>orca</packagereq>
-      <packagereq>PackageKit-command-not-found</packagereq>
-      <packagereq>PackageKit-gtk3-module</packagereq>
-      <packagereq>rygel</packagereq>
-      <packagereq>sane-backends-drivers-scanners</packagereq>
-      <packagereq>simple-scan</packagereq>
-      <packagereq>sushi</packagereq>
-      <packagereq>totem</packagereq>
-      <packagereq>totem-nautilus</packagereq>
-      <packagereq>tracker</packagereq>
-      <packagereq>tracker-miners</packagereq>
-      <packagereq>xdg-desktop-portal</packagereq>
-      <packagereq>xdg-desktop-portal-gtk</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>yelp</packagereq>
+      <packagereq type="default">at-spi2-atk</packagereq>
+      <packagereq type="default">at-spi2-core</packagereq>
+      <packagereq type="default">avahi</packagereq>
+      <packagereq type="default">baobab</packagereq>
+      <packagereq type="default">cheese</packagereq>
+      <packagereq type="default">chrome-gnome-shell</packagereq>
+      <packagereq type="default">eog</packagereq>
+      <packagereq type="default">evince</packagereq>
+      <packagereq type="default">evince-djvu</packagereq>
+      <packagereq type="default">evince-nautilus</packagereq>
+      <packagereq type="default">file-roller</packagereq>
+      <packagereq type="default">file-roller-nautilus</packagereq>
+      <packagereq type="default">fprintd-pam</packagereq>
+      <packagereq type="default">glib-networking</packagereq>
+      <packagereq type="default">gnome-backgrounds</packagereq>
+      <packagereq type="default">gnome-bluetooth</packagereq>
+      <packagereq type="default">gnome-calculator</packagereq>
+      <packagereq type="default">gnome-calendar</packagereq>
+      <packagereq type="default">gnome-characters</packagereq>
+      <packagereq type="default">gnome-classic-session</packagereq>
+      <packagereq type="default">gnome-clocks</packagereq>
+      <packagereq type="default">gnome-color-manager</packagereq>
+      <packagereq type="default">gnome-contacts</packagereq>
+      <packagereq type="default">gnome-disk-utility</packagereq>
+      <packagereq type="default">gnome-documents</packagereq>
+      <packagereq type="default">gnome-font-viewer</packagereq>
+      <packagereq type="default">gnome-getting-started-docs</packagereq>
+      <packagereq type="default">gnome-logs</packagereq>
+      <packagereq type="default">gnome-maps</packagereq>
+      <packagereq type="default">gnome-photos</packagereq>
+      <packagereq type="default">gnome-remote-desktop</packagereq>
+      <packagereq type="default">gnome-screenshot</packagereq>
+      <packagereq type="default">gnome-system-monitor</packagereq>
+      <packagereq type="default">gnome-terminal-nautilus</packagereq>
+      <packagereq type="default">gnome-themes-extra</packagereq>
+      <packagereq type="default">gnome-user-docs</packagereq>
+      <packagereq type="default">gnome-user-share</packagereq>
+      <packagereq type="default">gnome-weather</packagereq>
+      <packagereq type="default">gvfs-afc</packagereq>
+      <packagereq type="default">gvfs-afp</packagereq>
+      <packagereq type="default">gvfs-archive</packagereq>
+      <packagereq type="default">gvfs-fuse</packagereq>
+      <packagereq type="default">gvfs-goa</packagereq>
+      <packagereq type="default">gvfs-gphoto2</packagereq>
+      <packagereq type="default">gvfs-mtp</packagereq>
+      <packagereq type="default">gvfs-smb</packagereq>
+      <packagereq type="default">libcanberra-gtk2</packagereq>
+      <packagereq type="default">libcanberra-gtk3</packagereq>
+      <packagereq type="default">libproxy-mozjs</packagereq>
+      <packagereq type="default">librsvg2</packagereq>
+      <packagereq type="default">libsane-hpaio</packagereq>
+      <packagereq type="default">mesa-libEGL</packagereq>
+      <packagereq type="default">ModemManager</packagereq>
+      <packagereq type="default">mousetweaks</packagereq>
+      <packagereq type="default">nautilus-sendto</packagereq>
+      <packagereq type="default">NetworkManager-adsl</packagereq>
+      <packagereq type="default">NetworkManager-openconnect-gnome</packagereq>
+      <packagereq type="default">NetworkManager-openvpn-gnome</packagereq>
+      <packagereq type="default">NetworkManager-ppp</packagereq>
+      <packagereq type="default">NetworkManager-pptp-gnome</packagereq>
+      <packagereq type="default">NetworkManager-ssh-gnome</packagereq>
+      <packagereq type="default">NetworkManager-vpnc-gnome</packagereq>
+      <packagereq type="default">NetworkManager-wwan</packagereq>
+      <packagereq type="default">orca</packagereq>
+      <packagereq type="default">PackageKit-command-not-found</packagereq>
+      <packagereq type="default">PackageKit-gtk3-module</packagereq>
+      <packagereq type="default">rygel</packagereq>
+      <packagereq type="default">sane-backends-drivers-scanners</packagereq>
+      <packagereq type="default">simple-scan</packagereq>
+      <packagereq type="default">sushi</packagereq>
+      <packagereq type="default">totem</packagereq>
+      <packagereq type="default">totem-nautilus</packagereq>
+      <packagereq type="default">tracker</packagereq>
+      <packagereq type="default">tracker-miners</packagereq>
+      <packagereq type="default">xdg-desktop-portal</packagereq>
+      <packagereq type="default">xdg-desktop-portal-gtk</packagereq>
+      <packagereq type="default">xdg-user-dirs-gtk</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
+      <packagereq type="mandatory">gdm</packagereq>
       <packagereq type="mandatory">gedit</packagereq>
       <packagereq type="mandatory">gnome-boxes</packagereq>
       <packagereq type="mandatory">gnome-control-center</packagereq>
+      <packagereq type="mandatory">gnome-initial-setup</packagereq>
       <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
       <packagereq type="mandatory">gnome-session-xsession</packagereq>
       <packagereq type="mandatory">gnome-settings-daemon</packagereq>
@@ -2924,6 +2922,7 @@
       <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
+      <packagereq type="mandatory">yelp</packagereq>
     </packagelist>
   </group>
   <group>