Revert "Revert "Include gnome-desktop in workstation-product and deduplicate, take two""

This reverts commit db13483cc5.

https://lists.fedoraproject.org/archives/list/desktop@lists.fedoraproject.org/thread/KVK23TEU46LSAOZ3XOFZDJ2DFEKDIGIF/

Please discuss this on the desktop list before reverting again.

comps-f24.xml.in

@@ -2540,25 +2540,17 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>abrt-desktop</packagereq>
-      <packagereq>abrt-java-connector</packagereq>
-      <packagereq>aisleriot</packagereq>
       <packagereq>at-spi2-atk</packagereq>
       <packagereq>at-spi2-core</packagereq>
       <packagereq>avahi</packagereq>
       <packagereq>baobab</packagereq>
       <packagereq>bijiben</packagereq>
-      <packagereq>brasero</packagereq>
-      <packagereq>brasero-nautilus</packagereq>
       <packagereq>caribou</packagereq>
       <packagereq>caribou-gtk2-module</packagereq>
       <packagereq>caribou-gtk3-module</packagereq>
       <packagereq>cheese</packagereq>
       <packagereq>control-center</packagereq>
       <packagereq>dconf</packagereq>
-      <packagereq>deja-dup</packagereq>
-      <packagereq>deja-dup-nautilus</packagereq>
-      <packagereq>empathy</packagereq>
       <packagereq>eog</packagereq>
       <packagereq>evince</packagereq>
       <packagereq>evince-djvu</packagereq>
@@ -2568,9 +2560,7 @@
       <packagereq>evolution-help</packagereq>
       <packagereq>file-roller</packagereq>
       <packagereq>file-roller-nautilus</packagereq>
-      <packagereq>firewall-config</packagereq>
       <packagereq>fprintd-pam</packagereq>
-      <packagereq>fros-gnome</packagereq>
       <packagereq>gdm</packagereq>
       <packagereq>gedit</packagereq>
       <packagereq>glib-networking</packagereq>
@@ -2578,33 +2568,29 @@
       <packagereq>gnome-bluetooth</packagereq>
       <packagereq>gnome-boxes</packagereq>
       <packagereq>gnome-calculator</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-dictionary</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-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
+      <packagereq>gnome-session-wayland-session</packagereq>
       <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-sound-recorder</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
       <packagereq>gnome-terminal</packagereq>
       <packagereq>gnome-themes-standard</packagereq>
       <packagereq>gnome-user-docs</packagereq>
       <packagereq>gnome-user-share</packagereq>
       <packagereq>gnome-weather</packagereq>
-      <packagereq>google-android-emoji-fonts</packagereq>
-      <packagereq>gucharmap</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-afp</packagereq>
       <packagereq>gvfs-archive</packagereq>
@@ -2618,15 +2604,15 @@
       <packagereq>libproxy-mozjs</packagereq>
       <packagereq>librsvg2</packagereq>
       <packagereq>libsane-hpaio</packagereq>
+      <packagereq>ModemManager</packagereq>
       <packagereq>mousetweaks</packagereq>
       <packagereq>nautilus</packagereq>
       <packagereq>nautilus-sendto</packagereq>
-      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-adsl</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn-gnome</packagereq>
       <packagereq>NetworkManager-pptp-gnome</packagereq>
       <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
       <packagereq>orca</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
       <packagereq>PackageKit-gtk3-module</packagereq>
@@ -2635,13 +2621,10 @@
       <packagereq>rygel</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>seahorse</packagereq>
-      <packagereq>setroubleshoot</packagereq>
       <packagereq>shotwell</packagereq>
-      <packagereq>simple-scan</packagereq>
       <packagereq>sushi</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-nautilus</packagereq>
-      <packagereq>transmission-gtk</packagereq>
       <packagereq>vinagre</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>yelp</packagereq>
@@ -6385,96 +6368,36 @@
       <packagereq>adwaita-qt4</packagereq>
       <packagereq>adwaita-qt5</packagereq>
       <packagereq>at</packagereq>
-      <packagereq>at-spi2-atk</packagereq>
-      <packagereq>at-spi2-core</packagereq>
       <packagereq>attr</packagereq>
-      <packagereq>avahi</packagereq>
-      <packagereq>baobab</packagereq>
       <packagereq>bash-completion</packagereq>
       <packagereq>bc</packagereq>
-      <packagereq>bijiben</packagereq>
       <packagereq>bind-utils</packagereq>
       <packagereq>bridge-utils</packagereq>
       <packagereq>btrfs-progs</packagereq>
       <packagereq>bzip2</packagereq>
-      <packagereq>caribou</packagereq>
-      <packagereq>caribou-gtk2-module</packagereq>
-      <packagereq>caribou-gtk3-module</packagereq>
-      <packagereq>cheese</packagereq>
       <packagereq>chrony</packagereq>
       <packagereq>cifs-utils</packagereq>
-      <packagereq>control-center</packagereq>
       <packagereq>cpio</packagereq>
       <packagereq>crontabs</packagereq>
       <packagereq>cryptsetup</packagereq>
       <packagereq>cyrus-sasl-plain</packagereq>
-      <packagereq>dbus</packagereq>
-      <packagereq>dconf</packagereq>
       <packagereq>deltarpm</packagereq>
       <packagereq>dnf</packagereq>
       <packagereq>dnf-langpacks</packagereq>
       <packagereq>dnf-plugins-core</packagereq>
       <packagereq>dos2unix</packagereq>
       <packagereq>dosfstools</packagereq>
-      <packagereq>eog</packagereq>
       <packagereq>ethtool</packagereq>
-      <packagereq>evince</packagereq>
-      <packagereq>evince-djvu</packagereq>
-      <packagereq>evince-nautilus</packagereq>
-      <packagereq>evolution</packagereq>
-      <packagereq>evolution-ews</packagereq>
-      <packagereq>evolution-help</packagereq>
       <packagereq>fedora-productimg-workstation</packagereq>
       <packagereq>fedora-release-workstation</packagereq>
       <packagereq>fedora-user-agent-chrome</packagereq>
       <packagereq>file</packagereq>
-      <packagereq>file-roller</packagereq>
-      <packagereq>file-roller-nautilus</packagereq>
       <packagereq>fpaste</packagereq>
-      <packagereq>fprintd-pam</packagereq>
       <packagereq>fros-gnome</packagereq>
-      <packagereq>gdm</packagereq>
-      <packagereq>gedit</packagereq>
-      <packagereq>glib-networking</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
-      <packagereq>gnome-backgrounds</packagereq>
-      <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-boxes</packagereq>
-      <packagereq>gnome-calculator</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-kra-ora-thumbnailer</packagereq>
-      <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-session-wayland-session</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
-      <packagereq>gnome-settings-daemon</packagereq>
-      <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
-      <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
-      <packagereq>gnome-themes-standard</packagereq>
-      <packagereq>gnome-user-docs</packagereq>
-      <packagereq>gnome-user-share</packagereq>
-      <packagereq>gnome-weather</packagereq>
       <packagereq>gnupg2</packagereq>
       <packagereq>google-android-emoji-fonts</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>hunspell</packagereq>
       <packagereq>ibus-libzhuyin</packagereq>
       <packagereq>ibus-gtk2</packagereq>
@@ -6488,11 +6411,6 @@
       <packagereq>ibus-typing-booster</packagereq>
       <packagereq>iptstate</packagereq>
       <packagereq>jwhois</packagereq>
-      <packagereq>libcanberra-gtk2</packagereq>
-      <packagereq>libcanberra-gtk3</packagereq>
-      <packagereq>libproxy-mozjs</packagereq>
-      <packagereq>librsvg2</packagereq>
-      <packagereq>libsane-hpaio</packagereq>
       <packagereq>logrotate</packagereq>
       <packagereq>lrzsz</packagereq>
       <packagereq>lsof</packagereq>
@@ -6502,26 +6420,13 @@
       <packagereq>mdadm</packagereq>
       <packagereq>microcode_ctl</packagereq>
       <packagereq>mlocate</packagereq>
-      <packagereq>ModemManager</packagereq>
-      <packagereq>mousetweaks</packagereq>
       <packagereq>mtr</packagereq>
-      <packagereq>nautilus</packagereq>
-      <packagereq>nautilus-sendto</packagereq>
       <packagereq>net-tools</packagereq>
-      <packagereq>NetworkManager-adsl</packagereq>
-      <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn-gnome</packagereq>
-      <packagereq>NetworkManager-pptp-gnome</packagereq>
-      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>nfs-utils</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
       <packagereq>nmap-ncat</packagereq>
       <packagereq>nss-mdns</packagereq>
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
-      <packagereq>orca</packagereq>
-      <packagereq>PackageKit-command-not-found</packagereq>
-      <packagereq>PackageKit-gtk3-module</packagereq>
       <packagereq>pam_krb5</packagereq>
       <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
@@ -6543,44 +6448,33 @@
       <packagereq>quota</packagereq>
       <packagereq>rdist</packagereq>
       <packagereq>realmd</packagereq>
-      <packagereq>rhythmbox</packagereq>
       <packagereq>rng-tools</packagereq>
       <packagereq>rp-pppoe</packagereq>
       <packagereq>rsync</packagereq>
-      <packagereq>rygel</packagereq>
-      <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>scl-utils</packagereq>
-      <packagereq>seahorse</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>setuptool</packagereq>
-      <packagereq>shotwell</packagereq>
       <packagereq>sos</packagereq>
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
-      <packagereq>sushi</packagereq>
       <packagereq>symlinks</packagereq>
       <packagereq>tar</packagereq>
       <packagereq>tcpdump</packagereq>
       <packagereq>tcp_wrappers</packagereq>
       <packagereq>telnet</packagereq>
       <packagereq>time</packagereq>
-      <packagereq>totem</packagereq>
-      <packagereq>totem-nautilus</packagereq>
       <packagereq>traceroute</packagereq>
       <packagereq>tree</packagereq>
       <packagereq>unoconv</packagereq>
       <packagereq>unzip</packagereq>
       <packagereq>usbutils</packagereq>
       <packagereq>vconfig</packagereq>
-      <packagereq>vinagre</packagereq>
       <packagereq>wget</packagereq>
       <packagereq>which</packagereq>
       <packagereq>wireless-tools</packagereq>
       <packagereq>words</packagereq>
       <packagereq>wvdial</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>xorg-x11-drv-libinput</packagereq>
-      <packagereq>yelp</packagereq>
       <packagereq>zip</packagereq>
     </packagelist>
   </group>
@@ -7025,6 +6919,7 @@
       <groupid>core</groupid>
       <groupid>firefox</groupid>
       <groupid>fonts</groupid>
+      <groupid>gnome-desktop</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>