From dcaf6e96fea80dee4343a5444d2ab19a341c6f7f Mon Sep 17 00:00:00 2001
From: Harsh Jain <harshjain075@gmail.com>
Date: Mar 10 2020 16:04:31 +0000
Subject: Update comps-f31.xml.in


Added proper format to include pantheon desktop
---

diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 29299b3..d1aaaaf 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -4535,42 +4535,50 @@
       <packagereq type="mandatory">wingpanel-indicator-power</packagereq>
       <packagereq type="mandatory">wingpanel-indicator-session</packagereq>
       <packagereq type="mandatory">wingpanel-indicator-sound</packagereq>
-      <packagereq type="default">elementary-calculator</packagereq>
-      <packagereq type="default">elementary-calendar</packagereq>
-      <packagereq type="default">elementary-camera</packagereq>
-      <packagereq type="default">elementary-code</packagereq>
-      <packagereq type="default">elementary-files</packagereq>
-      <packagereq type="default">elementary-icon-theme</packagereq>
-      <packagereq type="default">elementary-music</packagereq>
-      <packagereq type="default">elementary-photos</packagereq>
-      <packagereq type="default">elementary-print</packagereq>
-      <packagereq type="default">elementary-screenshot-tool</packagereq>
-      <packagereq type="default">elementary-sound-theme</packagereq>
-      <packagereq type="default">elementary-terminal</packagereq>
-      <packagereq type="default">elementary-theme</packagereq>
-      <packagereq type="default">elementary-videos</packagereq>
-      <packagereq type="default">elementary-wallpapers</packagereq>
-      <packagereq type="default">switchboard</packagereq>
-      <packagereq type="default">switchboard-plug-a11y</packagereq>
-      <packagereq type="default">switchboard-plug-about</packagereq>
-      <packagereq type="default">switchboard-plug-applications</packagereq>
-      <packagereq type="default">switchboard-plug-bluetooth</packagereq>
-      <packagereq type="default">switchboard-plug-display</packagereq>
-      <packagereq type="default">switchboard-plug-keyboard</packagereq>
-      <packagereq type="default">switchboard-plug-mouse-touchpad</packagereq>
-      <packagereq type="default">switchboard-plug-networking</packagereq>
-      <packagereq type="default">switchboard-plug-notifications</packagereq>
-      <packagereq type="default">switchboard-plug-onlineaccounts</packagereq>
-      <packagereq type="default">switchboard-plug-pantheon-shell</packagereq>
-      <packagereq type="default">switchboard-plug-printers</packagereq>
-      <packagereq type="default">switchboard-plug-sharing</packagereq>
-      <packagereq type="default">switchboard-plug-sound</packagereq>
-      <packagereq type="optional">elementary-capnet-assist</packagereq>
-      <packagereq type="optional">elementary-greeter</packagereq>
-      <packagereq type="optional">elementary-shortcut-overlay</packagereq>
     </packagelist>
   </group>
   <group>
+  <id>pantheon-apps</id>
+  <_name>Pantheon Apps</_name>
+  <_description>The apps for Pantheo de</_description>
+  <default>false</default>
+  <uservisible>false</uservisisble>
+      <packagelist>
+        <packagereq type="default">elementary-calculator</packagereq>
+        <packagereq type="default">elementary-calendar</packagereq>
+        <packagereq type="default">elementary-camera</packagereq>
+        <packagereq type="default">elementary-code</packagereq>
+        <packagereq type="default">elementary-files</packagereq>
+        <packagereq type="default">elementary-icon-theme</packagereq>
+        <packagereq type="default">elementary-music</packagereq>
+        <packagereq type="default">elementary-photos</packagereq>
+        <packagereq type="default">elementary-print</packagereq>
+        <packagereq type="default">elementary-screenshot-tool</packagereq>
+        <packagereq type="default">elementary-sound-theme</packagereq>
+        <packagereq type="default">elementary-terminal</packagereq>
+        <packagereq type="default">elementary-theme</packagereq>
+        <packagereq type="default">elementary-videos</packagereq>
+        <packagereq type="default">elementary-wallpapers</packagereq>
+        <packagereq type="default">switchboard</packagereq>
+        <packagereq type="default">switchboard-plug-a11y</packagereq>
+        <packagereq type="default">switchboard-plug-about</packagereq>
+        <packagereq type="default">switchboard-plug-applications</packagereq>
+        <packagereq type="default">switchboard-plug-bluetooth</packagereq>
+        <packagereq type="default">switchboard-plug-display</packagereq>
+        <packagereq type="default">switchboard-plug-keyboard</packagereq>
+        <packagereq type="default">switchboard-plug-networking</packagereq>
+        <packagereq type="default">switchboard-plug-notifications</packagereq>
+        <packagereq type="default">switchboard-plug-onlineaccounts</packagereq>
+        <packagereq type="default">switchboard-plug-pantheon-shell</packagereq>
+        <packagereq type="default">switchboard-plug-printers</packagereq>
+        <packagereq type="default">switchboard-plug-sharing</packagereq>
+        <packagereq type="default">switchboard-plug-sound</packagereq>
+        <packagereq type="optional">elementary-capnet-assist</packagereq>
+        <packagereq type="optional">elementary-greeter</packagereq>
+        <packagereq type="optional">elementary-shortcut-overlay</packagereq>
+      </packagelist>
+     </group>
+  <group>
     <id>perl</id>
     <_name>Perl Development</_name>
     <_description>Support for developing programs in the Perl programming language.</_description>
@@ -6320,6 +6328,30 @@
     </optionlist>
   </environment>
   <environment>
+    <id>pantheon-desktop-environment</id>
+    <_name>Pantheon Desktop Environment</_name>
+    <_description>The Panhteon DE powering elementary OS.</_description>
+    <display_order>10</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>admin-tools</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>guest-desktop-agents</groupid>
+      <groupid>pantheon-desktop</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid default="true">firefox</groupid>
+      <groupid default="true">pantheon-apps</groupid>
+    </optionlist>
+  </environment>
     <!-- Intended only for the Fedora Server product; other products will not
          show this because they don’t include the fedora-release-server
          package.  Please keep this mostly in sync with