From fc8af8e736f18690317787ccd3f7e7d732b5caea Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 7 Sep 2012 13:06:22 +0900
Subject: [PATCH] add @basic-x-windows environment for those who don't want to
 install a full desktop env

- Window manager groups can be added as optional groups.
- current optional groups: input-methods, legacy-fonts, multimedia
---
 comps-f18.xml.in | 19 +++++++++++++++++++
 comps-f19.xml.in | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index ea857c58..df8ab121 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -6367,6 +6367,25 @@
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>basic-x-windows</id>
+    <_name>Basic X windows</_name>
+    <_description>X windows without a desktop environment.</_description>
+    <display_order>70</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>hardware-support</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>input-methods</groupid>
+      <groupid>legacy-fonts</groupid>
+      <groupid>multimedia</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>minimal</id>
     <_name>Minimal install</_name>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 25ba6ff9..4073613d 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -6348,6 +6348,25 @@
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>basic-x-windows</id>
+    <_name>Basic X windows</_name>
+    <_description>X windows without a desktop environment.</_description>
+    <display_order>70</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>hardware-support</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>input-methods</groupid>
+      <groupid>legacy-fonts</groupid>
+      <groupid>multimedia</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>minimal</id>
     <_name>Minimal install</_name>