From db020a79a660b090ebad9f05b55c6bf0203caf71 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 5 Feb 2025 23:47:13 -0700
Subject: [PATCH] Sync from Upstream (see notes)

The following comps have received changes

comps-rocky-10-lh.xml.in
---
 comps-rocky-10-lh.xml    | 12 ++++++++++++
 comps-rocky-10-lh.xml.in | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index d922354..59553ed 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -425,6 +425,16 @@
       <packagereq variant="AppStream">yelp-tools</packagereq>
     </packagelist>
   </group>
+  <group arch="aarch64,s390x,x86_64,ppc64le">
+    <id>gnome-desktop-server-defaults</id>
+    <name>GNOME Server Defaults</name>
+    <description>Defaults for running GNOME on servers.</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="AppStream">gnome-settings-daemon-server-defaults</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>graphical-admin-tools</id>
     <name>Graphical Administration Tools</name>
@@ -3730,6 +3740,7 @@
       <groupid>ftp-server</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>gnome-desktop</groupid>
+      <groupid>gnome-desktop-server-defaults</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
@@ -3755,6 +3766,7 @@
       <groupid>container-management</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
+      <groupid>gnome-desktop-server-defaults</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
       <groupid>hardware-monitoring</groupid>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 2faa8f2..35769d8 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -430,6 +430,16 @@
       <packagereq variant="AppStream">yelp-tools</packagereq>
     </packagelist>
   </group>
+  <group arch="aarch64,s390x,x86_64,ppc64le">
+    <id>gnome-desktop-server-defaults</id>
+    <_name>GNOME Server Defaults</_name>
+    <_description>Defaults for running GNOME on servers.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="AppStream">gnome-settings-daemon-server-defaults</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>graphical-admin-tools</id>
     <_name>Graphical Administration Tools</_name>
@@ -3928,6 +3938,7 @@
       <groupid>ftp-server</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>gnome-desktop</groupid>
+      <groupid>gnome-desktop-server-defaults</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
@@ -3953,6 +3964,7 @@
       <groupid>container-management</groupid>
       <groupid>fonts</groupid>
       <groupid>gnome-desktop</groupid>
+      <groupid>gnome-desktop-server-defaults</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
       <groupid>hardware-monitoring</groupid>
-- 
GitLab