From b8b8eb6f9773bc1314eab4f8719fef9069a144d2 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Feb 26 2019 10:24:47 +0000
Subject: [PATCH 1/2] comps-f3[01]: remove and/or replace yum and createrepo


https://fedoraproject.org/wiki/Changes/Retire_YUM_3
https://bugzilla.redhat.com/show_bug.cgi?id=1682910

In @system-tools, let's suggest createrepo_c instead of createrepo.

Technically, this is only required for F31, but I don't think we should
encourage use of yum in F30, even if it is available.

---

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 93aec42..76e1b9b 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -678,7 +678,6 @@
     <packagelist>
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">createrepo</packagereq>
       <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
@@ -697,7 +696,6 @@
       <packagereq type="mandatory">rpm-build</packagereq>
       <packagereq type="mandatory">selinux-policy</packagereq>
       <packagereq type="mandatory">setup</packagereq>
-      <packagereq type="mandatory">yum</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5440,7 +5438,7 @@
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">crack</packagereq>
       <packagereq type="optional">crash</packagereq>
-      <packagereq type="optional">createrepo</packagereq>
+      <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">dar</packagereq>
       <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">dkms</packagereq>
diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 93aec42..76e1b9b 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -678,7 +678,6 @@
     <packagelist>
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">createrepo</packagereq>
       <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
@@ -697,7 +696,6 @@
       <packagereq type="mandatory">rpm-build</packagereq>
       <packagereq type="mandatory">selinux-policy</packagereq>
       <packagereq type="mandatory">setup</packagereq>
-      <packagereq type="mandatory">yum</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5440,7 +5438,7 @@
       <packagereq type="optional">convmv</packagereq>
       <packagereq type="optional">crack</packagereq>
       <packagereq type="optional">crash</packagereq>
-      <packagereq type="optional">createrepo</packagereq>
+      <packagereq type="optional">createrepo_c</packagereq>
       <packagereq type="optional">dar</packagereq>
       <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">dkms</packagereq>

From 6529d0a83d9226f6c2e1f458cb33d9cef174d266 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Feb 26 2019 10:26:20 +0000
Subject: [PATCH 2/2] comps-f3[01]: nothing uses dash, let's drop it from critical path


$ dnf repoquery --releasever=rawhide --whatrequires dash
(nada)

---

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 76e1b9b..58f96e6 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -678,7 +678,6 @@
     <packagelist>
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 76e1b9b..58f96e6 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -678,7 +678,6 @@
     <packagelist>
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>