From b79e8726dfb81d06d162ee06252c0872e75dd471 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Sep 2011 09:26:40 -0400
Subject: [PATCH] Make gok optional in the gnome-desktop group

Also, explain why some library packages are listed explicitly
---
 comps-f16.xml.in | 5 ++++-
 comps-f17.xml.in | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index f776f0c5..562119de 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -2751,13 +2751,15 @@
       <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>
       <packagereq type="default">gvfs-gphoto2</packagereq>
       <packagereq type="default">gvfs-smb</packagereq>
       <packagereq type="default">ibus</packagereq>
+      <!-- these library packages are explicitly listed here
+           because they provide modules that are not otherwise
+           pulled in via dependencies -->
       <packagereq type="default">libcanberra-gtk2</packagereq>
       <packagereq type="default">libcanberra-gtk3</packagereq>
       <packagereq type="default">librsvg2</packagereq>
@@ -2823,6 +2825,7 @@
       <packagereq type="optional">gnome-schedule</packagereq>
       <packagereq type="optional">gnome-system-log</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
+      <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gthumb</packagereq>
diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index de604004..2ea76967 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -2777,13 +2777,15 @@
       <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>
       <packagereq type="default">gvfs-gphoto2</packagereq>
       <packagereq type="default">gvfs-smb</packagereq>
       <packagereq type="default">ibus</packagereq>
+      <!-- these library packages are explicitly listed here
+           because they provide modules that are not otherwise
+           pulled in via dependencies -->
       <packagereq type="default">libcanberra-gtk2</packagereq>
       <packagereq type="default">libcanberra-gtk3</packagereq>
       <packagereq type="default">libproxy-mozjs</packagereq>
@@ -2849,6 +2851,7 @@
       <packagereq type="optional">gnome-schedule</packagereq>
       <packagereq type="optional">gnome-system-log</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
+      <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gthumb</packagereq>