From b651fcd9121a1f120d1a8157404830a0bcd96ad9 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Jul 27 2015 13:36:25 +0000
Subject: sync variants to the fedora-install-foo kickstarts in spin-kickstarts


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/variants-fedora.xml b/variants-fedora.xml
index 37d5fad..b55b43b 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -8,32 +8,44 @@
             <arch>armhfp</arch>
         </arches>
         <groups>
-            <group default="true">base-x</group>
             <group default="true">guest-agents</group>
             <group default="true">standard</group>
             <group default="true">core</group>
-            <group default="true">input-methods</group>
-            <group default="true">multimedia</group>
             <group default="true">hardware-support</group>
-            <group default="true">admin-tools</group>
-            <group default="true">basic-desktop</group>
-            <group default="true">eclipse</group>
-            <group default="true">development-libs</group>
-            <group default="true">development-tools</group>
-            <group default="true">c-development</group>
-            <group default="true">rpm-development-tools</group>
-            <group default="true">fedora-packager</group>
-            <group default="true">virtualization</group>
+            <group default="true">^server-product-environment</group>
+            <group default="true">server-product</group>
+            <group default="true">headless-management</group>
+            <group default="true">container-management</group>
+            <group default="true">domain-client</group>
+            <group default="true">server-hardware-support</group>
+            <group default="true">mysql</group>
+            <group default="true">sql-server</group>
             <group default="true">web-server</group>
+            <group default="true">haproxy</group>
             <group default="true">mongodb</group>
             <group default="true">perl-web</group>
-            <group default="true">php</group>
             <group default="true">python-web</group>
+            <group default="true">php</group>
             <group default="true">rubyonrails</group>
-            <group default="true">mysql</group>
-            <group default="true">sql-server</group>
-            <group default="true">design-suite</group>
-            <group default="true">jbossas</group>
+            <group default="true">tomcat</group>
+            <group default="true">directory-server</group>
+            <group default="true">dogtag</group>
+            <group default="true">dns-server</group>
+            <group default="true">freeipa-server</group>
+            <group default="true">ftp-server</group>
+            <group default="true">mail-server</group>
+            <group default="true">network-server</group>
+            <group default="true">printing</group>
+            <group default="true">smb-server</group>
+            <group default="true">virtualization</group>
+            <group default="true">load-balancer</group>
+            <group default="true">ha</group>
+            <group default="true">javaenterprise</group>
+            <group default="true">editors</group>
+            <group default="true">network-server</group>
+            <group default="true">system-tools</group>
+            <group default="true">text-internet</group>
+            <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
         </groups>
     </variant>
@@ -46,10 +58,7 @@
         <groups>
             <group default="true">base-x</group>
             <group default="true">guest-desktop-agents</group>
-            <group default="true">guest-agents</group>
-            <group default="true">standard</group>
             <group default="true">core</group>
-            <group default="true">dial-up</group>
             <group default="true">fonts</group>
             <group default="true">input-methods</group>
             <group default="true">multimedia</group>
@@ -57,64 +66,11 @@
             <group default="true">printing</group>
             <group default="true">admin-tools</group>
             <group default="true">basic-desktop</group>
-            <!-- GNOME -->
             <group default="true">firefox</group>
-            <group default="true">gnome-desktop</group>
-            <group default="true">epiphany</group>
             <group default="true">libreoffice</group>
-            <group default="true">gnome-games</group>
-            <!-- KDE -->
-            <group default="true">kde-desktop</group>
-            <group default="true">kde-apps</group>
-            <group default="true">kde-education</group>
-            <group default="true">kde-media</group>
-            <group default="true">kde-office</group>
-            <!-- XFCE -->
-            <group default="true">xfce-desktop</group>
-            <group default="true">xfce-apps</group>
-            <group default="true">xfce-extra-plugins</group>
-            <group default="true">xfce-media</group>
-            <group default="true">xfce-office</group>
-            <!-- LXDE -->
-            <group default="true">lxde-desktop</group>
-            <group default="true">lxde-apps</group>
-            <group default="true">lxde-media</group>
-            <group default="true">lxde-office</group>
-            <!-- SUGAR -->
-            <group default="true">sugar-desktop</group>
-            <group default="true">sugar-apps</group>
-            <!-- MATE -->
-            <group default="true">mate-desktop</group>
-            <!-- CINNAMON -->
-            <group default="true">cinnamon-desktop</group>
-            <!-- Workstation -->
-            <group default="true">eclipse</group>
-            <group default="true">development-libs</group>
-            <group default="true">development-tools</group>
-            <group default="true">c-development</group>
-            <group default="true">rpm-development-tools</group>
-            <group default="true">fedora-packager</group>
-            <group default="true">gnome-software-development</group>
-            <group default="true">kde-software-development</group>
-            <group default="true">x-software-development</group>
-            <group default="true">virtualization</group>
-            <group default="true">web-server</group>
-            <group default="true">mongodb</group>
-            <group default="true">perl-web</group>
-            <group default="true">php</group>
-            <group default="true">python-web</group>
-            <group default="true">rubyonrails</group>
-            <group default="true">mysql</group>
-            <group default="true">sql-server</group>
-            <group default="true">design-suite</group>
-            <!-- Not included yet due to space concerns
-            <group default="true">jbossas</group>
-            <group default="true">milkymist</group>
-            <group default="true">mingw32</group>
-            <group default="true">ocaml</group>
-            <group default="true">robotics-suite</group>
-            <group default="true">electronic-lab</group>
-            -->
+            <group default="true">networkmanager-submodules</group>
+            <group default="true">workstation-product</group>
+            <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
         </groups>
     </variant>
@@ -125,29 +81,24 @@
             <arch>armhfp</arch>
         </arches>
         <groups>
-            <group default="true">base-x</group>
-            <group default="true">guest-desktop-agents</group>
-            <group default="true">guest-agents</group>
-            <group default="true">standard</group>
+            <group default="true">cloud-server</group>
             <group default="true">core</group>
-            <group default="true">dial-up</group>
-            <group default="true">fonts</group>
-            <group default="true">input-methods</group>
-            <group default="true">multimedia</group>
-            <group default="true">hardware-support</group>
-            <group default="true">printing</group>
-            <group default="true">admin-tools</group>
-            <group default="true">basic-desktop</group>
-            <group default="true">virtualization</group>
-            <group default="true">web-server</group>
-            <group default="true">mongodb</group>
-            <group default="true">perl-web</group>
-            <group default="true">php</group>
-            <group default="true">python-web</group>
-            <group default="true">rubyonrails</group>
+            <group default="true">standard</group>
+            <group default="true">headless-management</group>
+            <group default="true">dogtag</group>
+            <group default="true">directory-server</group>
+            <group default="true">dns-server</group>
+            <group default="true">freeipa-server</group>
+            <group default="true">ftp-server</group>
+            <group default="true">guest-agents</group>
+            <group default="true">ha</group>
+            <group default="true">load-balancer</group>
+            <group default="true">mail-server</group>
             <group default="true">mysql</group>
+            <group default="true">network-server</group>
+            <group default="true">smb-server</group>
             <group default="true">sql-server</group>
-            <group default="true">jbossas</group>
+            <group default="true">web-server</group>
             <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
         </groups>