From a0df346ba7851111363adccdedeab4cc5d3edb24 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: May 12 2020 20:56:56 +0000
Subject: Add Recommends: for everything we have added to comps since F22


This is stupid. Yes, we know it's unmaintainable and hopeless. Yes, we know it will cause some unwanted packages to appear on upgrade to F33. But we have to do this somewhere to achieve our goal of ensuring upgraded systems have everything you would otherwise get on a fresh install, and we can think of no better place than fedora-release-workstation. F21 was the first Fedora Workstation, so this goes back in time as far back as F22 (the first upgrade) and makes sure we have recommends for everything we have ever added to the gnome-desktop or workstation-product groups in comps.

This change is incomplete. We need to also check the following default comps groups included in Workstation (taken from live kickstart, not the environment group, but hopefully they are the same):

@base-x
@container-management
@core
@firefox
@fonts
@guest-desktop-agents
@hardware-support
@libreoffice
@multimedia
@networkmanager-submodules
@printing
---

diff --git a/fedora-release.spec b/fedora-release.spec
index 02b929f..10e6d1e 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -494,6 +494,72 @@ Provides:       system-release-product
 # fedora-release-identity-workstation if nothing else is already doing so.
 Recommends:     fedora-release-identity-workstation
 
+# Ugly hack! Here we duplicate every package that we have added to comps.
+# Some of these are unnecessary, but try to be comprehensive anyway.
+# https://pagure.io/fedora-workstation/issue/138
+# https://bugzilla.redhat.com/show_bug.cgi?id=1814306
+Recommends:     ModemManager
+Recommends:     NetworkManager-adsl
+Recommends:     NetworkManager-config-connectivity-fedora
+Recommends:     NetworkManager-openconnect-gnome
+Recommends:     NetworkManager-ppp
+Recommends:     NetworkManager-ssh-gnome
+Recommends:     NetworkManager-wwan
+Recommends:     adobe-source-code-pro-fonts
+Recommends:     adwaita-qt4
+Recommends:     adwaita-qt5
+Recommends:     chrome-gnome-shell
+Recommends:     desktop-backgrounds-gnome
+Recommends:     dnf-langpacks
+Recommends:     earlyoom
+Recommends:     evince-djvu
+Recommends:     evince-nautilus
+Recommends:     fedora-chromium-config
+Recommends:     fedora-workstation-backgrounds
+Recommends:     file-roller-nautilus
+Recommends:     fros-gnome
+Recommends:     gamemode
+Recommends:     git
+Recommends:     glibc-all-langpacks
+Recommends:     gnome-boxes
+Recommends:     gnome-calendar
+Recommends:     gnome-characters
+Recommends:     gnome-control-center
+Recommends:     gnome-keyring-pam
+Recommends:     gnome-logs
+Recommends:     gnome-maps
+Recommends:     gnome-photos
+Recommends:     gnome-remote-desktop
+Recommends:     gnome-session-xsession
+Recommends:     gnome-session-wayland-session
+Recommends:     gnome-terminal-nautilus
+Recommends:     gnome-themes-extra
+Recommends:     ibus-libzhuyin
+Recommends:     ibus-qt
+Recommends:     linux-firmware
+Recommends:     mesa-libEGL
+Recommends:     nano
+Recommends:     nmap-ncat
+Recommends:     opensc
+Recommends:     pam_afs_session
+Recommends:     pinentry-gnome3
+Recommends:     policycoreutils-python-utils
+Recommends:     polkit
+Recommends:     psmisc
+Recommends:     qgnomeplatform
+Recommends:     qt5-qtbase
+Recommends:     qt5-qtbase-gui
+Recommends:     qt5-qtdeclarative
+Recommends:     qt5-qtxmlpatterns
+Recommends:     simple-scan
+Recommends:     systemd-udev
+Recommends:     totem-nautilus
+Recommends:     tracker
+Recommends:     tracker-miners
+Recommends:     xdg-desktop-portal
+Recommends:     xdg-desktop-portal-gtk
+Recommends:     xorg-x11-drv-libinput
+Recommends:     zram
 
 %description workstation
 Provides a base package for Fedora Workstation-specific configuration files to