From 176cd408678d93c9d81b722ea7144f8348ee8ae7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 21 Mar 2011 14:44:10 -0400
Subject: [PATCH] gnome-desktop: move closer to upstream modulesets

Make gnome-color-manager, gnote and gok optional.
---
 comps-f15.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index 8b43a905..6cff53de 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -2647,7 +2647,6 @@
       <packagereq type="default">glib-networking</packagereq>
       <packagereq type="default">gnome-backgrounds</packagereq>
       <packagereq type="default">gnome-bluetooth</packagereq>
-      <packagereq type="default">gnome-color-manager</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>
       <packagereq type="default">gnome-disk-utility-nautilus</packagereq>
       <packagereq type="default">gnome-games</packagereq>
@@ -2661,8 +2660,6 @@
       <packagereq type="default">gnome-terminal</packagereq>
       <packagereq type="default">gnome-user-docs</packagereq>
       <packagereq type="default">gnome-utils</packagereq>
-      <packagereq type="default">gnote</packagereq>
-      <packagereq type="default">gok</packagereq>
       <packagereq type="default">gucharmap</packagereq>
       <packagereq type="default">gvfs-archive</packagereq>
       <packagereq type="default">gvfs-fuse</packagereq>
@@ -2722,6 +2719,7 @@
       <packagereq type="optional">gnome-applet-sensors</packagereq>
       <packagereq type="optional">gnome-applet-timer</packagereq>
       <packagereq type="optional">gnome-applets</packagereq>
+      <packagereq type="optional">gnome-color-manager</packagereq>
       <packagereq type="optional">gnome-commander</packagereq>
       <packagereq type="optional">gnome-device-manager</packagereq>
       <packagereq type="optional">gnome-media-apps</packagereq>
@@ -2732,7 +2730,9 @@
       <packagereq type="optional">gnome-schedule</packagereq>
       <packagereq type="optional">gnome-system-log</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
+      <packagereq type="optional">gnote</packagereq>
       <packagereq type="optional">gnotime</packagereq>
+      <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gthumb</packagereq>