From f2c544c9d56c374f41fd18beb8ab11f4e4f51a16 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 4 Oct 2012 19:08:00 +0900
Subject: [PATCH] basic-x-windows: make @lightdm-gtk default and drop optional
 @lxdm for now; add optional @cinnamon

---
 comps-f18.xml.in | 16 ++++++----------
 comps-f19.xml.in | 18 +++++++-----------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index de3a7b79..30e7a951 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -675,17 +675,13 @@
     </packagelist>
   </group>
   <group>
-    <id>lxdm</id>
-    <_name>LXDM</_name>
-    <_description>Lightwight X Display Manager</_description>
+    <id>cinnamon</id>
+    <_name>Cinnamon</_name>
+    <_description>Cinnamon Desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>adwaita-cursor-theme</packagereq>
-      <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>firstboot</packagereq>
-      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>cinnamon</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5994,13 +5990,13 @@
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
+      <groupid>lightdm</groupid>
     </grouplist>
     <optionlist>
+      <groupid>cinnamon</groupid>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
-      <groupid>lightdm</groupid>
-      <groupid>lxdm</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 0a8cea33..9505c699 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -99,8 +99,8 @@
       <packagereq>glib-networking</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-color-manager</packagereq>
       <packagereq>gnome-clocks</packagereq>
+      <packagereq>gnome-color-manager</packagereq>
       <packagereq>gnome-contacts</packagereq>
       <packagereq>gnome-dictionary</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
@@ -688,17 +688,13 @@
     </packagelist>
   </group>
   <group>
-    <id>lxdm</id>
-    <_name>LXDM</_name>
-    <_description>Lightwight X Display Manager</_description>
+    <id>cinnamon</id>
+    <_name>Cinnamon</_name>
+    <_description>Cinnamon Desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>adwaita-cursor-theme</packagereq>
-      <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>firstboot</packagereq>
-      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>cinnamon</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6007,13 +6003,13 @@
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
+      <groupid>lightdm</groupid>
     </grouplist>
     <optionlist>
+      <groupid>cinnamon</groupid>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
-      <groupid>lightdm</groupid>
-      <groupid>lxdm</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>