From 68a2f35b04e35c704ce253a2078c93a3d59a7a93 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Oct 14 2019 16:24:34 +0000
Subject: dnf-yum was renamed yum in Fedora 31+


Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 6b4ea36..0636a1e 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 9fa4bef..c925c51 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>