From bc297e1633709d3f01c61dc994167771b254ef06 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 21 Jul 2014 13:57:07 +0100
Subject: [PATCH] Move system-config-printer from default to optional (bug
 #846290).

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

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 832cc120..ef9b8197 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -4993,7 +4993,6 @@
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">paps</packagereq>
       <packagereq type="default">samba-client</packagereq>
-      <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="default">nss-mdns</packagereq>
       <packagereq type="optional">a2ps</packagereq>
@@ -5004,6 +5003,7 @@
       <packagereq type="optional">pnm2ppa</packagereq>
       <packagereq type="optional">ptouch-driver</packagereq>
       <packagereq type="optional">splix</packagereq>
+      <packagereq type="optional">system-config-printer</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5347,10 +5347,10 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">system-config-httpd</packagereq>
       <packagereq type="default">system-config-nfs</packagereq>
-      <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-samba</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>
+      <packagereq type="optional">system-config-printer</packagereq>
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 9898bfc3..47662697 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -4993,7 +4993,6 @@
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">paps</packagereq>
       <packagereq type="default">samba-client</packagereq>
-      <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="default">nss-mdns</packagereq>
       <packagereq type="optional">a2ps</packagereq>
@@ -5004,6 +5003,7 @@
       <packagereq type="optional">pnm2ppa</packagereq>
       <packagereq type="optional">ptouch-driver</packagereq>
       <packagereq type="optional">splix</packagereq>
+      <packagereq type="optional">system-config-printer</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5347,10 +5347,10 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">system-config-httpd</packagereq>
       <packagereq type="default">system-config-nfs</packagereq>
-      <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-samba</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>
+      <packagereq type="optional">system-config-printer</packagereq>
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>