From b7ad3ea57c214f01d5ca1737c16bbe7ccd29b134 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: May 31 2016 17:36:24 +0000
Subject: sync variants file from f24


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

---

diff --git a/variants-fedora.xml b/variants-fedora.xml
index b55b43b..a44ceb4 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -1,53 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
 <variants>
+    <variant id="Atomic" name="Atomic" type="variant" is_empty="true">
+        <arches>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
+    <variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
+        <arches>
+            <arch>i386</arch>
+            <arch>x86_64</arch>
+            <arch>aarch64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+        </arches>
+    </variant>
+    <variant id="Docker" name="Docker" type="variant" is_empty="true">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>armhfp</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
+    <variant id="Everything" name="Everything" type="variant">
+        <arches>
+            <arch>i386</arch>
+            <arch>x86_64</arch>
+            <arch>armhfp</arch>
+            <arch>aarch64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390</arch>
+            <arch>s390x</arch>
+        </arches>
+    </variant>
+    <variant id="Labs" name="Labs" type="variant" is_empty="true">
+        <arches>
+            <arch>i386</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
     <variant id="Server" name="Server" type="variant">
         <arches>
             <arch>i386</arch>
             <arch>x86_64</arch>
             <arch>armhfp</arch>
+            <arch>aarch64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390</arch>
+            <arch>s390x</arch>
         </arches>
         <groups>
             <group default="true">guest-agents</group>
             <group default="true">standard</group>
             <group default="true">core</group>
             <group default="true">hardware-support</group>
+            <group default="true">networkmanager-submodules</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">python-web</group>
-            <group default="true">php</group>
-            <group default="true">rubyonrails</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">virtualization-headless</group>
+            <group default="true">ansible-node</group>
             <group default="true">editors</group>
-            <group default="true">network-server</group>
-            <group default="true">system-tools</group>
-            <group default="true">text-internet</group>
+            <group default="true">arm-tools</group>
             <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
+            <group default="true">platform-vmware</group>
         </groups>
+        <environments>
+          <environment display_order="2">server-product-environment</environment>
+          <environment display_order="99">custom-environment</environment>
+        </environments>
+        <buildinstallpackages>
+            <package>fedora-productimg-server</package>
+        </buildinstallpackages>
+    </variant>
+    <variant id="Spins" name="Spins" type="variant" is_empty="true">
+        <arches>
+            <arch>i386</arch>
+            <arch>x86_64</arch>
+            <arch>armhfp</arch>
+        </arches>
     </variant>
     <variant id="Workstation" name="Workstation" type="variant">
         <arches>
@@ -57,28 +101,37 @@
         </arches>
         <groups>
             <group default="true">base-x</group>
-            <group default="true">guest-desktop-agents</group>
             <group default="true">core</group>
+            <group default="true">firefox</group>
             <group default="true">fonts</group>
-            <group default="true">input-methods</group>
-            <group default="true">multimedia</group>
+            <group default="true">gnome-desktop</group>
+            <group default="true">guest-desktop-agents</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">firefox</group>
             <group default="true">libreoffice</group>
+            <group default="true">multimedia</group>
             <group default="true">networkmanager-submodules</group>
+            <group default="true">printing</group>
             <group default="true">workstation-product</group>
+            <group default="true">arm-tools</group>
             <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
+            <group default="true">platform-vmware</group>
         </groups>
+        <environments>
+          <environment display_order="10">workstation-product-environment</environment>
+        </environments>
+        <buildinstallpackages>
+            <package>fedora-productimg-workstation</package>
+        </buildinstallpackages>
     </variant>
     <variant name="Cloud" id="Cloud" type="variant">
         <arches>
             <arch>i386</arch>
             <arch>x86_64</arch>
             <arch>armhfp</arch>
+            <arch>aarch64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
         </arches>
         <groups>
             <group default="true">cloud-server</group>
@@ -101,6 +154,13 @@
             <group default="true">web-server</group>
             <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
+            <group default="true">platform-vmware</group>
         </groups>
+        <environments>
+          <environment display_order="10">cloud-server-environment</environment>
+        </environments>
+        <buildinstallpackages>
+            <package>fedora-productimg-cloud</package>
+        </buildinstallpackages>
     </variant>
 </variants>