From 61f4c2a52b4c0825be220c20b99986c9e480554b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 4 Mar 2021 17:30:33 -0800
Subject: [PATCH] Drop plymouth from @core and @standard (#1933378)

As discussed in the bug report, the fallback text theme for
Plymouth is under-maintained and buggy. Plymouth maintainers
would prefer we use the graphical theme or not use Plymouth at
all. Consensus seems to support using graphical theme for
graphical installs and no Plymouth at all for non-graphical
installs, so this aims to achieve that, by dropping plymouth
from @core and @standard but keeping plymouth-system-theme in
@base-x and changing the plymouth in @workstation-product to
plymouth-system-theme (this isn't strictly necessary, but makes
things clear and consistent).

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

diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index 27f1a4de..51afd1fc 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -585,7 +585,6 @@
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">parted</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
-      <packagereq type="mandatory">plymouth</packagereq>
       <packagereq type="mandatory">policycoreutils</packagereq>
       <packagereq type="mandatory">procps-ng</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
@@ -5023,7 +5022,6 @@
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinfo</packagereq>
-      <packagereq>plymouth</packagereq>
       <packagereq>psacct</packagereq>
       <packagereq>quota</packagereq>
       <packagereq>realmd</packagereq>
@@ -5580,7 +5578,7 @@
       <packagereq type="default">pciutils</packagereq>
       <packagereq type="default">pinentry-gnome3</packagereq>
       <packagereq type="default">pinfo</packagereq>
-      <packagereq type="default">plymouth</packagereq>
+      <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">policycoreutils-python-utils</packagereq>
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">psmisc</packagereq>
diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 179eee12..a0f7b272 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -585,7 +585,6 @@
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">parted</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
-      <packagereq type="mandatory">plymouth</packagereq>
       <packagereq type="mandatory">policycoreutils</packagereq>
       <packagereq type="mandatory">procps-ng</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
@@ -5025,7 +5024,6 @@
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinfo</packagereq>
-      <packagereq>plymouth</packagereq>
       <packagereq>psacct</packagereq>
       <packagereq>quota</packagereq>
       <packagereq>realmd</packagereq>
@@ -5583,7 +5581,7 @@
       <packagereq type="default">pciutils</packagereq>
       <packagereq type="default">pinentry-gnome3</packagereq>
       <packagereq type="default">pinfo</packagereq>
-      <packagereq type="default">plymouth</packagereq>
+      <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">policycoreutils-python-utils</packagereq>
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">psmisc</packagereq>