From e1b36b31352a39eb58a17a703358d31964debd29 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 6 Jan 2025 14:14:26 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    | 19 +++++++++++++++----
 comps-rocky-10-lh.xml.in | 25 +++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 28fbf07..074f940 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -1154,6 +1154,18 @@
       <packagereq variant="AppStream" type="default">vim-enhanced</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>base-graphical</id>
+    <name>base-graphical</name>
+    <description>Common packages for any graphical session</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>mesa-vulkan-drivers</packagereq>
+      <packagereq>plymouth-system-theme</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>system-tools</id>
     <name>System Tools</name>
@@ -3712,7 +3724,7 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>server-product</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
@@ -3759,7 +3771,7 @@
     <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
     <display_order>3</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>core</groupid>
       <groupid>standard</groupid>
       <groupid>internet-browser</groupid>
@@ -3862,9 +3874,8 @@
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
-      <groupid>legacy-x</groupid>
       <groupid>remote-desktop-clients</groupid>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
     </grouplist>
   </category>
   
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 99c7561..4c2e026 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -1167,6 +1167,18 @@
       <rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
     </packagelist>
   </group>
+  <group>
+    <id>base-graphical</id>
+    <_name>base-graphical</_name>
+    <_description>Common packages for any graphical session</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>mesa-vulkan-drivers</packagereq>
+      <packagereq>plymouth-system-theme</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>system-tools</id>
     <_name>System Tools</_name>
@@ -3906,7 +3918,7 @@
     <_description>An integrated, easy-to-manage server with a graphical interface.</_description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>server-product</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
@@ -4020,7 +4032,7 @@
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
     <display_order>90</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>fonts</groupid>
@@ -4062,7 +4074,6 @@
       <groupid>postgresql</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">load-balancer</groupid>
-      <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
       <groupid>mainframe-access</groupid>
       <groupid>hardware-monitoring</groupid>
@@ -4076,7 +4087,7 @@
     <_description>Desktop environment and general purpose apps.</_description>
     <display_order>80</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
@@ -4096,7 +4107,6 @@
     <optionlist>
       <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>smart-card</groupid>
-      <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
     </optionlist>
@@ -4107,7 +4117,7 @@
     <_description>Workstation is a user-friendly desktop system for laptops and PCs.</_description>
     <display_order>3</display_order>
     <grouplist>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
       <groupid>core</groupid>
       <groupid>standard</groupid>
       <groupid>internet-browser</groupid>
@@ -4210,9 +4220,8 @@
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
-      <groupid>legacy-x</groupid>
       <groupid>remote-desktop-clients</groupid>
-      <groupid>base-x</groupid>
+      <groupid>base-graphical</groupid>
     </grouplist>
   </category>
   <!--  <category>
-- 
GitLab