From bb0055b90a5a584ee4f50a0b0df1c0844e93a8a6 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <elio.maldonado.batiz@gmail.com>
Date: Thu, 10 Oct 2019 11:41:48 -0700
Subject: [PATCH 1/3] Crypto-utils has been from F31+

- Changes for f32 only
---
 comps-f32.xml.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 5b5e883a..9fa4bef3 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -5772,7 +5772,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">httpd</packagereq>
-      <packagereq type="default">crypto-utils</packagereq>
       <packagereq type="default">httpd-manual</packagereq>
       <packagereq type="default">mod_perl</packagereq>
       <packagereq type="default">mod_ssl</packagereq>

From 68a2f35b04e35c704ce253a2078c93a3d59a7a93 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 14 Oct 2019 09:24:34 -0700
Subject: [PATCH 2/3] dnf-yum was renamed yum in Fedora 31+

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-f31.xml.in | 2 +-
 comps-f32.xml.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 6b4ea369..0636a1e3 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -614,7 +614,6 @@
       <packagereq type="mandatory">curl</packagereq>
       <packagereq type="mandatory">dhcp-client</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
-      <packagereq type="mandatory">dnf-yum</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>
       <packagereq type="mandatory">glibc</packagereq>
@@ -643,6 +642,7 @@
       <packagereq type="mandatory">systemd</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
+      <packagereq type="mandatory">yum</packagereq>
       <packagereq type="default">dnf-plugins-core</packagereq>
       <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">firewalld</packagereq>
diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 9fa4bef3..c925c516 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -613,7 +613,6 @@
       <packagereq type="mandatory">curl</packagereq>
       <packagereq type="mandatory">dhcp-client</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
-      <packagereq type="mandatory">dnf-yum</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>
       <packagereq type="mandatory">glibc</packagereq>
@@ -642,6 +641,7 @@
       <packagereq type="mandatory">systemd</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
+      <packagereq type="mandatory">yum</packagereq>
       <packagereq type="default">dnf-plugins-core</packagereq>
       <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">firewalld</packagereq>

From 8d7b0bd492e30d87d57dd1c3f396c8c4b7d88c37 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <elio.maldonado.batiz@gmail.com>
Date: Mon, 14 Oct 2019 09:58:18 -0700
Subject: [PATCH 3/3] Packages removed from F31+ that break fedora-development
 group

Addresses https://pagure.io/fedora-comps/issue/425
This is for F32 only
---
 comps-f32.xml.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 9fa4bef3..895eecde 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -613,7 +613,6 @@
       <packagereq type="mandatory">curl</packagereq>
       <packagereq type="mandatory">dhcp-client</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
-      <packagereq type="mandatory">dnf-yum</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>
       <packagereq type="mandatory">glibc</packagereq>
@@ -975,7 +974,6 @@
       <packagereq type="default">cyrus-sasl-devel</packagereq>
       <packagereq type="default">dbus-devel</packagereq>
       <packagereq type="default">gmp-devel</packagereq>
-      <packagereq type="default">hesiod-devel</packagereq>
       <packagereq type="default">krb5-devel</packagereq>
       <packagereq type="default">libacl-devel</packagereq>
       <packagereq type="default">libattr-devel</packagereq>
@@ -2789,7 +2787,6 @@
       <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>
@@ -3517,7 +3514,6 @@
       <packagereq type="default">kuiviewer</packagereq>
       <packagereq type="default">okteta</packagereq>
       <packagereq type="default">poxml</packagereq>
-      <packagereq type="default">pykde4-devel</packagereq>
       <packagereq type="default">PyQt4-devel</packagereq>
       <packagereq type="default">umbrello</packagereq>
       <packagereq type="optional">audiocd-kio-devel</packagereq>
@@ -6015,7 +6011,6 @@
       <packagereq type="default">libXtst-devel</packagereq>
       <packagereq type="default">libXvMC-devel</packagereq>
       <packagereq type="default">libXxf86dga-devel</packagereq>
-      <packagereq type="default">libXxf86misc-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">mesa-libGL-devel</packagereq>
       <packagereq type="default">netpbm-devel</packagereq>