From 3c4eaf74a1e64ed221af93623739bcfb078980ab Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 31 Jul 2018 14:36:26 -0400
Subject: [PATCH] f29: Update container-management again

We need flatpak-builder for Silverblue.  For the others...let's
make podman default since that's where the containers team emphasis
is, and everything else optional.
---
 comps-f29.xml.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/comps-f29.xml.in b/comps-f29.xml.in
index 4353609d..954c3ecc 100644
--- a/comps-f29.xml.in
+++ b/comps-f29.xml.in
@@ -708,12 +708,15 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">atomic</packagereq>
-      <packagereq type="conditional" requires="cockpit">cockpit-docker</packagereq>
-      <packagereq type="default">docker</packagereq>
+      <packagereq type="default">podman</packagereq>
+      <packagereq type="optional">docker</packagereq>
+      <packagereq type="optional">cockpit-docker</packagereq>
+      <packagereq type="optional">atomic</packagereq>
       <packagereq type="optional">buildah</packagereq>
       <packagereq type="optional">origin-clients</packagereq>
       <packagereq type="optional">podman</packagereq>
+      <packagereq type="optional">flatpak</packagereq>
+      <packagereq type="optional">flatpak-builder</packagereq>
     </packagelist>
   </group>
   <group>