From 0bdd4d0bb9faab7bb277019940f0e47f8d1739ca Mon Sep 17 00:00:00 2001
From: Chris Murphy <chrismurphy@fedoraproject.org>
Date: Thu, 16 Jul 2020 15:35:39 -0600
Subject: [PATCH] Move zram-generator-defaults to @core

"Fedora Custom Operating System" (minimal) doesn't install
zram-generator-defaults, but should because it no longer has a swap
partition created at installation time. By moving to @core, everything
will get zram-generator(-defaults) unless it explicitly opts out.

Amends:
https://pagure.io/fedora-comps/pull-request/513
Related change:
https://fedoraproject.org/wiki/Changes/SwapOnZRAM

Signed-off-by: Chris Murphy chrismurphy@fedoraproject.org
---
 comps-f33.xml.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/comps-f33.xml.in b/comps-f33.xml.in
index b9f128cf..2bfc1531 100644
--- a/comps-f33.xml.in
+++ b/comps-f33.xml.in
@@ -618,6 +618,7 @@
       <packagereq type="default">lsvpd</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">powerpc-utils</packagereq>
+      <packagereq type="default">zram-generator-defaults</packagereq>
       <packagereq type="optional">dracut-config-generic</packagereq>
       <packagereq type="optional">initial-setup</packagereq>
       <packagereq type="optional">initscripts</packagereq>
@@ -4949,7 +4950,6 @@
       <packagereq>wireless-tools</packagereq>
       <packagereq>words</packagereq>
       <packagereq>zip</packagereq>
-      <packagereq>zram-generator-defaults</packagereq>
       <packagereq type="conditional" requires="gnome-control-center">chrony</packagereq>
     </packagelist>
   </group>
@@ -5524,7 +5524,6 @@
       <packagereq type="default">wireless-tools</packagereq>
       <packagereq type="default">words</packagereq>
       <packagereq type="default">zip</packagereq>
-      <packagereq type="default">zram-generator-defaults</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6524,4 +6523,4 @@
     <match install="tesseract-langpack-%s" name="tesseract"/>
     <match install="tkgate-%s" name="tkgate"/>
   </langpacks>
-</comps>
\ No newline at end of file
+</comps>