From b5f13092b8f973cbfcefda09f14c6e924096471b Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 12 Aug 2024 18:55:22 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    | 42 ++++++++++++++++++++++++++--------------
 comps-rocky-10-lh.xml.in | 31 ++++++++++++++++++++++++++---
 comps-rocky-9-lh.xml     |  2 +-
 comps-rocky-9-lh.xml.in  |  2 +-
 4 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index cb8108f..dad7859 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -233,7 +233,6 @@
       <packagereq variant="BaseOS" type="mandatory">selinux-policy-targeted</packagereq>
       <packagereq variant="BaseOS" type="mandatory">setup</packagereq>
       <packagereq variant="BaseOS" type="mandatory">shadow-utils</packagereq>
-      
       <packagereq variant="BaseOS" type="mandatory">sssd-common</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sssd-kcm</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
@@ -266,8 +265,6 @@
       <packagereq variant="BaseOS" type="default">sg3_utils-libs</packagereq>
       <packagereq variant="BaseOS" type="default">initscripts-rename-device</packagereq>
       <packagereq variant="AppStream" type="default">python3-libselinux</packagereq>
-      
-      
       <packagereq variant="BaseOS" type="optional">dracut-config-generic</packagereq>
       <packagereq variant="BaseOS" type="optional">dracut-network</packagereq>
       <packagereq variant="BaseOS" type="optional" arch="s390x">libzfcphbaapi</packagereq>
@@ -372,7 +369,6 @@
       <packagereq variant="AppStream">gnome-control-center</packagereq>
       <packagereq variant="AppStream">dconf</packagereq>
       <packagereq variant="AppStream" arch="ppc64le,x86_64">loupe</packagereq>
-      <packagereq variant="AppStream">evince</packagereq>
       <packagereq variant="AppStream" arch="ppc64le,x86_64">fprintd-pam</packagereq>
       <packagereq variant="AppStream">gdm</packagereq>
       <packagereq variant="AppStream">gnome-text-editor</packagereq>
@@ -1036,8 +1032,6 @@
       <packagereq variant="BaseOS" type="default">sos</packagereq>
       <packagereq variant="BaseOS" type="default">sssd</packagereq>
       <packagereq variant="BaseOS" type="default">strace</packagereq>
-      
-      
       <packagereq variant="BaseOS" type="default">time</packagereq>
       <packagereq variant="BaseOS" type="default">unzip</packagereq>
       <packagereq variant="BaseOS" type="default">usbutils</packagereq>
@@ -1062,7 +1056,6 @@
       <packagereq variant="AppStream" type="default">wget</packagereq>
       <packagereq variant="AppStream" type="default">vim-enhanced</packagereq>
       <packagereq variant="AppStream" type="default">insights-client</packagereq>
-      
     </packagelist>
   </group>
   <group>
@@ -1141,8 +1134,6 @@
       <packagereq variant="BaseOS" type="default">sos</packagereq>
       <packagereq variant="BaseOS" type="default">sssd</packagereq>
       <packagereq variant="BaseOS" type="default">strace</packagereq>
-      
-      
       <packagereq variant="BaseOS" type="default">time</packagereq>
       <packagereq variant="BaseOS" type="default">unzip</packagereq>
       <packagereq variant="BaseOS" type="default">usbutils</packagereq>
@@ -1166,8 +1157,6 @@
       <packagereq variant="AppStream" type="default">tcpdump</packagereq>
       <packagereq variant="AppStream" type="default">wget</packagereq>
       <packagereq variant="AppStream" type="default">vim-enhanced</packagereq>
-      
-      
     </packagelist>
   </group>
   <group>
@@ -1855,7 +1844,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      
       <packagereq type="default">ant</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
@@ -2196,7 +2184,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory" arch="ppc64le,s390x,x86_64">gfs2-utils</packagereq>
       <packagereq type="mandatory">lvm2-lockd</packagereq>
       <packagereq type="default">cockpit-ha-cluster</packagereq>
       <packagereq type="default">dlm</packagereq>
@@ -2421,7 +2408,6 @@
       <packagereq type="default">enchant2-devel</packagereq>
       <packagereq type="default">enchant-devel</packagereq>
       <packagereq type="default">espeak-ng-devel</packagereq>
-      <packagereq type="default">evince-devel</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
@@ -3367,6 +3353,34 @@
       <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">libiptcdata-devel</packagereq>
       <packagereq type="default">source-highlight-devel</packagereq>
+      <packagereq type="default">rust-std-static-x86_64-unknown-none</packagereq>
+      <packagereq type="default">gtk-vnc2-devel</packagereq>
+      <packagereq type="default">gvnc-devel</packagereq>
+      <packagereq type="default">libdbusmenu-gtk3-devel</packagereq>
+      <packagereq type="default">cairo-tools</packagereq>
+      <packagereq type="default">dbus-doc</packagereq>
+      <packagereq type="default">dbus-python-devel</packagereq>
+      <packagereq type="default">gcr3-devel</packagereq>
+      <packagereq type="default">gtk4-devel-tools</packagereq>
+      <packagereq type="default">libgweather-doc</packagereq>
+      <packagereq type="default">libhandy-devel</packagereq>
+      <packagereq type="default">libportal-devel</packagereq>
+      <packagereq type="default">libportal-devel-doc</packagereq>
+      <packagereq type="default">libportal-gtk3-devel</packagereq>
+      <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libsoup3-doc</packagereq>
+      <packagereq type="default">libxml2-static</packagereq>
+      <packagereq type="default">mm-common</packagereq>
+      <packagereq type="default">mm-common-docs</packagereq>
+      <packagereq type="default">tecla-devel</packagereq>
+      <packagereq type="default">tracker-doc</packagereq>
+      <packagereq type="default">yelp-xsl-devel</packagereq>
+      <packagereq type="default">editorconfig</packagereq>
+      <packagereq type="default">editorconfig-devel</packagereq>
+      <packagereq type="default">gtksourceview5-devel</packagereq>
+      <packagereq type="default">libadwaita-doc</packagereq>
+      <packagereq type="default">sysprof-devel</packagereq>
+      <packagereq type="default">vte291-gtk4-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 5e1ab09..d27423a 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -372,7 +372,6 @@
       <packagereq variant="AppStream">gnome-control-center</packagereq>
       <packagereq variant="AppStream">dconf</packagereq>
       <packagereq arch="ppc64le,x86_64" variant="AppStream">loupe</packagereq>
-      <packagereq variant="AppStream">evince</packagereq>
       <packagereq arch="ppc64le,x86_64" variant="AppStream">fprintd-pam</packagereq>
       <packagereq variant="AppStream">gdm</packagereq>
       <packagereq variant="AppStream">gnome-text-editor</packagereq>
@@ -2410,7 +2409,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq arch="ppc64le,s390x,x86_64" type="mandatory">gfs2-utils</packagereq>
       <packagereq type="mandatory">lvm2-lockd</packagereq>
       <packagereq type="default">cockpit-ha-cluster</packagereq>
       <packagereq type="default">dlm</packagereq>
@@ -2635,7 +2633,6 @@
       <packagereq type="default">enchant2-devel</packagereq>
       <packagereq type="default">enchant-devel</packagereq>
       <packagereq type="default">espeak-ng-devel</packagereq>
-      <packagereq type="default">evince-devel</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
       <packagereq type="default">evolution-data-server-doc</packagereq>
       <packagereq type="default">evolution-data-server-perl</packagereq>
@@ -3581,6 +3578,34 @@
       <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">libiptcdata-devel</packagereq>
       <packagereq type="default">source-highlight-devel</packagereq>
+      <packagereq type="default">rust-std-static-x86_64-unknown-none</packagereq>
+      <packagereq type="default">gtk-vnc2-devel</packagereq>
+      <packagereq type="default">gvnc-devel</packagereq>
+      <packagereq type="default">libdbusmenu-gtk3-devel</packagereq>
+      <packagereq type="default">cairo-tools</packagereq>
+      <packagereq type="default">dbus-doc</packagereq>
+      <packagereq type="default">dbus-python-devel</packagereq>
+      <packagereq type="default">gcr3-devel</packagereq>
+      <packagereq type="default">gtk4-devel-tools</packagereq>
+      <packagereq type="default">libgweather-doc</packagereq>
+      <packagereq type="default">libhandy-devel</packagereq>
+      <packagereq type="default">libportal-devel</packagereq>
+      <packagereq type="default">libportal-devel-doc</packagereq>
+      <packagereq type="default">libportal-gtk3-devel</packagereq>
+      <packagereq type="default">libportal-gtk4-devel</packagereq>
+      <packagereq type="default">libsoup3-doc</packagereq>
+      <packagereq type="default">libxml2-static</packagereq>
+      <packagereq type="default">mm-common</packagereq>
+      <packagereq type="default">mm-common-docs</packagereq>
+      <packagereq type="default">tecla-devel</packagereq>
+      <packagereq type="default">tracker-doc</packagereq>
+      <packagereq type="default">yelp-xsl-devel</packagereq>
+      <packagereq type="default">editorconfig</packagereq>
+      <packagereq type="default">editorconfig-devel</packagereq>
+      <packagereq type="default">gtksourceview5-devel</packagereq>
+      <packagereq type="default">libadwaita-doc</packagereq>
+      <packagereq type="default">sysprof-devel</packagereq>
+      <packagereq type="default">vte291-gtk4-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index ff83f74..479b327 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2696,7 +2696,7 @@
       <packagereq type="default">catatonit</packagereq>
       <packagereq type="default">cglib</packagereq>
       <packagereq type="default">cifs-utils-devel</packagereq>
-      <packagereq type="default" arch="x86_64">cxl-devel</packagereq>
+      <packagereq type="default">cxl-devel</packagereq>
       <packagereq type="default">cjose-devel</packagereq>
       <packagereq type="default">clucene-core-devel</packagereq>
       <packagereq type="default">colord-devel</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index d7fe763..195be85 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -2950,7 +2950,7 @@
       <packagereq type="default">catatonit</packagereq>
       <packagereq type="default">cglib</packagereq>
       <packagereq type="default">cifs-utils-devel</packagereq>
-      <packagereq type="default" arch="x86_64">cxl-devel</packagereq>
+      <packagereq type="default">cxl-devel</packagereq>
       <packagereq type="default">cjose-devel</packagereq>
       <packagereq type="default">clucene-core-devel</packagereq>
       <packagereq type="default">colord-devel</packagereq>