From baa975ae3db05a99b68562ca0de5595bf935f469 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 27 Oct 2024 13:08:47 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    | 18 ++++--------------
 comps-rocky-10-lh.xml.in | 22 +++++-----------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index a8c0f48..ea831ac 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -345,7 +345,7 @@
   <group arch="aarch64,s390x,x86_64,ppc64le">
     <id>gnome-desktop</id>
     <name>GNOME</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
+    <description>Desktop environment and general purpose apps.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1693,7 +1693,7 @@
   <group variant="AppStream">
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
-    <description/>
+    <description>Remote desktop app supporting RDP</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1917,16 +1917,6 @@
       <packagereq type="optional">netpbm-progs</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream" arch="ppc64le,x86_64">
-    <id>gnome-apps</id>
-    <name>GNOME Applications</name>
-    <description>A set of commonly used GNOME Applications.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">brasero</packagereq>
-    </packagelist>
-  </group>
   
   <group variant="AppStream">
     <id>dns-server</id>
@@ -2578,6 +2568,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -3242,6 +3233,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libsoup3-doc</packagereq>
       <packagereq type="default">libxml2-static</packagereq>
       <packagereq type="default">mm-common</packagereq>
@@ -3685,7 +3677,6 @@
       <groupid>workstation-product</groupid>
     </grouplist>
     <optionlist>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
@@ -3788,7 +3779,6 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
     </grouplist>
   </category>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 9aada5a..afe5e02 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -348,7 +348,7 @@
   <group arch="aarch64,s390x,x86_64,ppc64le">
     <id>gnome-desktop</id>
     <_name>GNOME</_name>
-    <_description>GNOME is a highly intuitive and user-friendly desktop environment.</_description>
+    <_description>Desktop environment and general purpose apps.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -1717,7 +1717,7 @@
   <group variant="AppStream">
     <id>remote-desktop-clients</id>
     <_name>Remote Desktop Clients</_name>
-    <description/>
+    <_description>Remote desktop app supporting RDP</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -2031,16 +2031,6 @@
       <packagereq type="optional">netpbm-progs</packagereq>
     </packagelist>
   </group>
-  <group arch="ppc64le,x86_64" variant="AppStream">
-    <id>gnome-apps</id>
-    <_name>GNOME Applications</_name>
-    <_description>A set of commonly used GNOME Applications.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">brasero</packagereq>
-    </packagelist>
-  </group>
   <!--  <group variant="AppStream">
     <id>dogtag</id>
     <_name>Dogtag Certificate System</_name>
@@ -2805,6 +2795,7 @@
       <packagereq type="default">libknet1-devel</packagereq>
       <packagereq type="default">libksba-devel</packagereq>
       <packagereq type="default">libldb-devel</packagereq>
+      <packagereq type="default">liblerc-devel</packagereq>
       <packagereq type="default">liblognorm-devel</packagereq>
       <packagereq type="default">liblouis-devel</packagereq>
       <packagereq type="default">liblouis-doc</packagereq>
@@ -3469,6 +3460,7 @@
       <packagereq type="default">libportal-devel-doc</packagereq>
       <packagereq type="default">libportal-gtk3-devel</packagereq>
       <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libportal-qt6-devel</packagereq>
       <packagereq type="default">libsoup3-doc</packagereq>
       <packagereq type="default">libxml2-static</packagereq>
       <packagereq type="default">mm-common</packagereq>
@@ -3979,7 +3971,6 @@
       <groupid>desktop-debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>virtualization-client</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>
@@ -4020,7 +4011,7 @@
 <!--  <environment arch="x86_64,ppc64le" variant="AppStream">
     <id>gnome-desktop-environment</id>
     <_name>GNOME Desktop</_name>
-    <_description>GNOME is a highly intuitive and user-friendly desktop environment.</_description>
+    <_description>Desktop environment and general purpose apps.</_description>
     <display_order>80</display_order>
     <grouplist>
       <groupid>base-x</groupid>
@@ -4041,7 +4032,6 @@
       <groupid>java-platform</groupid>
     </grouplist>
     <optionlist>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>smart-card</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
@@ -4068,7 +4058,6 @@
       <groupid>workstation-product</groupid>
     </grouplist>
     <optionlist>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
@@ -4182,7 +4171,6 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
     </grouplist>
   </category>