From b33073f9493285dcf618cc469215b3b8fcb769f1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 11 Oct 2012 12:16:42 -0700
Subject: [PATCH] fixups for cinnamon - typos, description, group name

typo in the description of the group
copy the description of the group to the environment
have the environment use the correct name for the group
drop cinnamon from the 'window managers that aren't part of a bigger environment' group
---
 comps-f18.xml.in | 7 +++----
 comps-f19.xml.in | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 58161a2f..f7fa141d 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -673,7 +673,7 @@
   <group>
     <id>cinnamon-desktop</id>
     <_name>Cinnamon Desktop</_name>
-    <_description>Cinnamon provides a deskop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5667,7 +5667,6 @@
       <packagereq type="optional">bbkeys</packagereq>
       <packagereq type="optional">blackbox</packagereq>
       <packagereq type="optional">bluetile</packagereq>
-      <packagereq type="optional">cinnamon</packagereq>
       <packagereq type="optional">dwm</packagereq>
       <packagereq type="optional">dwm-user</packagereq>
       <packagereq type="optional">fluxbox</packagereq>
@@ -5893,7 +5892,7 @@
   <environment>
     <id>cinnamon-desktop</id>
     <_name>Cinnamon Desktop</_name>
-    <_description>.</_description>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <display_order>21</display_order>
     <grouplist>
       <groupid>base-x</groupid>
@@ -5905,7 +5904,7 @@
       <groupid>multimedia</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
-      <groupid>cinnamon</groupid>
+      <groupid>cinnamon-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>libreoffice</groupid>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 7ec2885e..8554fa90 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -673,7 +673,7 @@
   <group>
     <id>cinnamon-desktop</id>
     <_name>Cinnamon Desktop</_name>
-    <_description>Cinnamon provides a deskop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5666,7 +5666,6 @@
       <packagereq type="optional">bbkeys</packagereq>
       <packagereq type="optional">blackbox</packagereq>
       <packagereq type="optional">bluetile</packagereq>
-      <packagereq type="optional">cinnamon</packagereq>
       <packagereq type="optional">dwm</packagereq>
       <packagereq type="optional">dwm-user</packagereq>
       <packagereq type="optional">fluxbox</packagereq>
@@ -5892,7 +5891,7 @@
   <environment>
     <id>cinnamon-desktop</id>
     <_name>Cinnamon Desktop</_name>
-    <_description>.</_description>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <display_order>21</display_order>
     <grouplist>
       <groupid>base-x</groupid>
@@ -5904,7 +5903,7 @@
       <groupid>multimedia</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
-      <groupid>cinnamon</groupid>
+      <groupid>cinnamon-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>libreoffice</groupid>