From eca29ec02a66f509d8469954c9454b0b6ac3c64f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 30 Apr 2013 16:42:31 -0400
Subject: [PATCH] authconfig & firewalld are installed by anaconda
 automatically anyway. List them to be complete. (#874763)

---
 comps-f19.xml.in | 4 ++--
 comps-f20.xml.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 5b623e2a..e9b677e1 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -1154,7 +1154,6 @@
       <packagereq>acl</packagereq>
       <packagereq>at</packagereq>
       <packagereq>attr</packagereq>
-      <packagereq>authconfig</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bind-utils</packagereq>
       <packagereq>bzip2</packagereq>
@@ -1164,7 +1163,6 @@
       <packagereq>dbus</packagereq>
       <packagereq>ed</packagereq>
       <packagereq>file</packagereq>
-      <packagereq>firewalld</packagereq>
       <packagereq>fpaste</packagereq>
       <packagereq>logrotate</packagereq>
       <packagereq>lsof</packagereq>
@@ -1421,6 +1419,8 @@
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
+      <packagereq type="default">authconfig</packagereq>
+      <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
       <packagereq type="default">sendmail</packagereq>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 9cad71d1..a523cda9 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -1155,7 +1155,6 @@
       <packagereq>acl</packagereq>
       <packagereq>at</packagereq>
       <packagereq>attr</packagereq>
-      <packagereq>authconfig</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bind-utils</packagereq>
       <packagereq>bzip2</packagereq>
@@ -1165,7 +1164,6 @@
       <packagereq>dbus</packagereq>
       <packagereq>ed</packagereq>
       <packagereq>file</packagereq>
-      <packagereq>firewalld</packagereq>
       <packagereq>fpaste</packagereq>
       <packagereq>logrotate</packagereq>
       <packagereq>lsof</packagereq>
@@ -1422,6 +1420,8 @@
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
+      <packagereq type="default">authconfig</packagereq>
+      <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
       <packagereq type="default">sendmail</packagereq>