From 94184297bf74a88e1b3d13c413cb181dadcb1fe9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 28 Aug 2012 15:14:40 -0400
Subject: [PATCH] Make sugar-desktop group match other desktop groups in form.

---
 comps-f18.xml.in | 80 ++++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 4cb53716..aab4b6f1 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -5484,48 +5484,48 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">csound-python</packagereq>
-      <packagereq type="mandatory">gnome-power-manager</packagereq>
-      <packagereq type="mandatory">gvfs</packagereq>
-      <packagereq type="mandatory">metacity</packagereq>
-      <packagereq type="mandatory">pygame</packagereq>
-      <packagereq type="mandatory">sugar</packagereq>
-      <packagereq type="mandatory">sugar-toolkit-gtk3</packagereq>
-      <packagereq type="default">etoys-sugar</packagereq>
+      <packagereq>csound-python</packagereq>
+      <packagereq>gnome-power-manager</packagereq>
+      <packagereq>gvfs</packagereq>
+      <packagereq>metacity</packagereq>
+      <packagereq>pygame</packagereq>
+      <packagereq>sugar</packagereq>
+      <packagereq>sugar-toolkit-gtk3</packagereq>
+      <packagereq>etoys-sugar</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>smolt-firstboot</packagereq>
-      <packagereq type="default">gdm</packagereq>
-      <packagereq type="default">sugar-abacus</packagereq>
-      <packagereq type="default">sugar-browse</packagereq>
-      <packagereq type="default">sugar-calculator</packagereq>
-      <packagereq type="default">sugar-chat</packagereq>
-      <packagereq type="default">sugar-clock</packagereq>
-      <packagereq type="default">sugar-countries</packagereq>
-      <packagereq type="default">sugar-finance</packagereq>
-      <packagereq type="default">sugar-getiabooks</packagereq>
-      <packagereq type="default">sugar-help</packagereq>
-      <packagereq type="default">sugar-imageviewer</packagereq>
-      <packagereq type="default">sugar-infoslicer</packagereq>
-      <packagereq type="default">sugar-jukebox</packagereq>
-      <packagereq type="default">sugar-labyrinth</packagereq>
-      <packagereq type="default">sugar-log</packagereq>
-      <packagereq type="default">sugar-maze</packagereq>
-      <packagereq type="default">sugar-memorize</packagereq>
-      <packagereq type="default">sugar-moon</packagereq>
-      <packagereq type="default">sugar-paint</packagereq>
-      <packagereq type="default">sugar-physics</packagereq>
-      <packagereq type="default">sugar-pippy</packagereq>
-      <packagereq type="default">sugar-portfolio</packagereq>
-      <packagereq type="default">sugar-read</packagereq>
-      <packagereq type="default">sugar-record</packagereq>
-      <packagereq type="default">sugar-ruler</packagereq>
-      <packagereq type="default">sugar-speak</packagereq>
-      <packagereq type="default">sugar-terminal</packagereq>
-      <packagereq type="default">sugar-turtleart</packagereq>
-      <packagereq type="default">sugar-typing-turtle</packagereq>
-      <packagereq type="default">sugar-visualmatch</packagereq>
-      <packagereq type="default">sugar-write</packagereq>
-      <packagereq type="default">sugar-xoirc</packagereq>
+      <packagereq>gdm</packagereq>
+      <packagereq>sugar-abacus</packagereq>
+      <packagereq>sugar-browse</packagereq>
+      <packagereq>sugar-calculator</packagereq>
+      <packagereq>sugar-chat</packagereq>
+      <packagereq>sugar-clock</packagereq>
+      <packagereq>sugar-countries</packagereq>
+      <packagereq>sugar-finance</packagereq>
+      <packagereq>sugar-getiabooks</packagereq>
+      <packagereq>sugar-help</packagereq>
+      <packagereq>sugar-imageviewer</packagereq>
+      <packagereq>sugar-infoslicer</packagereq>
+      <packagereq>sugar-jukebox</packagereq>
+      <packagereq>sugar-labyrinth</packagereq>
+      <packagereq>sugar-log</packagereq>
+      <packagereq>sugar-maze</packagereq>
+      <packagereq>sugar-memorize</packagereq>
+      <packagereq>sugar-moon</packagereq>
+      <packagereq>sugar-paint</packagereq>
+      <packagereq>sugar-physics</packagereq>
+      <packagereq>sugar-pippy</packagereq>
+      <packagereq>sugar-portfolio</packagereq>
+      <packagereq>sugar-read</packagereq>
+      <packagereq>sugar-record</packagereq>
+      <packagereq>sugar-ruler</packagereq>
+      <packagereq>sugar-speak</packagereq>
+      <packagereq>sugar-terminal</packagereq>
+      <packagereq>sugar-turtleart</packagereq>
+      <packagereq>sugar-typing-turtle</packagereq>
+      <packagereq>sugar-visualmatch</packagereq>
+      <packagereq>sugar-write</packagereq>
+      <packagereq>sugar-xoirc</packagereq>
     </packagelist>
   </group>
   <group>