From fb009c0d86bb54f8051146b583aea372df5a54ea Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 19 Oct 2012 12:10:28 +0900
Subject: [PATCH] rename @basic-x-windows-setup to @basic-x-windows-desktop and
 add some default window managers

- install awesome, blackbox, ratpoison and xmonad-basic by default
- list metacity explicitly for firstboot and gdm to avoid openbox
- @xmonad now installs full xmonad and xmobar
---
 comps-f18.xml.in | 17 +++++++++++------
 comps-f19.xml.in | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index bec70cbb..86637127 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -656,16 +656,21 @@
     </packagelist>
   </group>
   <group>
-    <id>basic-x-windows-setup</id>
-    <_name>Basic X Windows Setup</_name>
-    <_description>Setup to start a basic X windows session</_description>
+    <id>basic-x-windows-desktop</id>
+    <_name>Basic X Windows</_name>
+    <_description>Basic X windows desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq>awesome</packagereq>
+      <packagereq>blackbox</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>gdm</packagereq>
       <packagereq>gnome-icon-theme-symbolic</packagereq>
+      <packagereq>metacity</packagereq>
+      <packagereq>ratpoison</packagereq>
+      <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -702,8 +707,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>dmenu</packagereq>
-      <packagereq>xmonad-basic</packagereq>
+      <packagereq>xmobar</packagereq>
+      <packagereq>xmonad</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6061,7 +6066,7 @@
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
-      <groupid>basic-x-windows-setup</groupid>
+      <groupid>basic-x-windows-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 160a4979..313cd226 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -656,16 +656,21 @@
     </packagelist>
   </group>
   <group>
-    <id>basic-x-windows-setup</id>
-    <_name>Basic X Windows Setup</_name>
-    <_description>Setup to start a basic X windows session</_description>
+    <id>basic-x-windows-desktop</id>
+    <_name>Basic X Windows</_name>
+    <_description>Basic X windows desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq>awesome</packagereq>
+      <packagereq>blackbox</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>gdm</packagereq>
       <packagereq>gnome-icon-theme-symbolic</packagereq>
+      <packagereq>metacity</packagereq>
+      <packagereq>ratpoison</packagereq>
+      <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -702,8 +707,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>dmenu</packagereq>
-      <packagereq>xmonad-basic</packagereq>
+      <packagereq>xmobar</packagereq>
+      <packagereq>xmonad</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6060,7 +6065,7 @@
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
-      <groupid>basic-x-windows-setup</groupid>
+      <groupid>basic-x-windows-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>