From 15889e40a1254e66f471da75b0e0e7bb381df965 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 9 Mar 2018 22:16:39 -0800
Subject: [PATCH] Make core Workstation packages mandatory

This makes core Workstation components, including the 'Core
Applications' from the technical specification, mandatory in
comps. This means that if they are removed, the group they are
in (gnome-desktop or firefox) is no longer considered to be
installed, and compose of any images containing these groups
will fail if any of the packages cannot be installed (which is
the main goal of the change; to avoid the images composing but
missing these key packages).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-f29.xml.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/comps-f29.xml.in b/comps-f29.xml.in
index e563fc96..86470b7e 100644
--- a/comps-f29.xml.in
+++ b/comps-f29.xml.in
@@ -1768,7 +1768,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>fedora-bookmarks</packagereq>
-      <packagereq>firefox</packagereq>
+      <packagereq type="mandatory">firefox</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2674,8 +2674,8 @@
       <packagereq>caribou-gtk2-module</packagereq>
       <packagereq>caribou-gtk3-module</packagereq>
       <packagereq>cheese</packagereq>
-      <packagereq>control-center</packagereq>
-      <packagereq>dconf</packagereq>
+      <packagereq type="mandatory">control-center</packagereq>
+      <packagereq type="mandatory">dconf</packagereq>
       <packagereq>eog</packagereq>
       <!-- <packagereq>epiphany</packagereq> -->
       <packagereq>evince</packagereq>
@@ -2685,11 +2685,11 @@
       <packagereq>file-roller-nautilus</packagereq>
       <packagereq>fprintd-pam</packagereq>
       <packagereq>gdm</packagereq>
-      <packagereq>gedit</packagereq>
+      <packagereq type="mandatory">gedit</packagereq>
       <packagereq>glib-networking</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-boxes</packagereq>
+      <packagereq type="mandatory">gnome-boxes</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-calendar</packagereq>
       <packagereq>gnome-characters</packagereq>
@@ -2706,13 +2706,13 @@
       <packagereq>gnome-maps</packagereq>
       <packagereq>gnome-photos</packagereq>
       <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-session-wayland-session</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
-      <packagereq>gnome-settings-daemon</packagereq>
-      <packagereq>gnome-shell</packagereq>
-      <packagereq>gnome-software</packagereq>
+      <packagereq type="mandatory">gnome-session-wayland-session</packagereq>
+      <packagereq type="mandatory">gnome-session-xsession</packagereq>
+      <packagereq type="mandatory">gnome-settings-daemon</packagereq>
+      <packagereq type="mandatory">gnome-shell</packagereq>
+      <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
+      <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq>gnome-themes-standard</packagereq>
       <packagereq>gnome-user-docs</packagereq>
       <packagereq>gnome-user-share</packagereq>
@@ -2732,7 +2732,7 @@
       <packagereq>libsane-hpaio</packagereq>
       <packagereq>ModemManager</packagereq>
       <packagereq>mousetweaks</packagereq>
-      <packagereq>nautilus</packagereq>
+      <packagereq type="mandatory">nautilus</packagereq>
       <packagereq>nautilus-sendto</packagereq>
       <packagereq>NetworkManager-adsl</packagereq>
       <packagereq>NetworkManager-openconnect-gnome</packagereq>
@@ -2743,7 +2743,7 @@
       <packagereq>orca</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
       <packagereq>PackageKit-gtk3-module</packagereq>
-      <packagereq>polkit</packagereq>
+      <packagereq type="mandatory">polkit</packagereq>
       <packagereq>rygel</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>sushi</packagereq>