From b24288b95507d41c5a8a36d37c178ad6fc9cfc8f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 23 Jul 2024 19:17:28 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    |  5 +++--
 comps-rocky-10-lh.xml.in |  5 +++--
 comps-rocky-9-lh.xml     | 19 ++++++++++++++-----
 comps-rocky-9-lh.xml.in  |  3 +++
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 55e9056..d45e25b 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -1014,7 +1014,7 @@
       <packagereq variant="BaseOS" type="default">dosfstools</packagereq>
       <packagereq variant="BaseOS" type="default">ethtool</packagereq>
       <packagereq variant="BaseOS" type="default">gnupg2</packagereq>
-      <packagereq variant="BaseOS" type="default">iprutils</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="ppc64le">iprutils</packagereq>
       <packagereq variant="BaseOS" type="default">ledmon</packagereq>
       <packagereq variant="AppStream" type="default">libstoragemgmt</packagereq>
       <packagereq variant="BaseOS" type="default">lvm2</packagereq>
@@ -1120,7 +1120,7 @@
       <packagereq variant="BaseOS" type="default">dosfstools</packagereq>
       <packagereq variant="BaseOS" type="default">ethtool</packagereq>
       <packagereq variant="BaseOS" type="default">gnupg2</packagereq>
-      <packagereq variant="BaseOS" type="default">iprutils</packagereq>
+      <packagereq variant="BaseOS" type="default" arch="ppc64le">iprutils</packagereq>
       <packagereq variant="BaseOS" type="default">ledmon</packagereq>
       <packagereq variant="AppStream" type="default">libstoragemgmt</packagereq>
       <packagereq variant="BaseOS" type="default">lvm2</packagereq>
@@ -3435,6 +3435,7 @@
       <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">libiptcdata-devel</packagereq>
+      <packagereq type="default">source-highlight-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 23ee253..e1b780f 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -1014,7 +1014,7 @@
       <packagereq type="default" variant="BaseOS">dosfstools</packagereq>
       <packagereq type="default" variant="BaseOS">ethtool</packagereq>
       <packagereq type="default" variant="BaseOS">gnupg2</packagereq>
-      <packagereq type="default" variant="BaseOS">iprutils</packagereq>
+      <packagereq type="default" arch="ppc64le" variant="BaseOS">iprutils</packagereq>
       <packagereq type="default" variant="BaseOS">ledmon</packagereq>
       <packagereq type="default" variant="AppStream">libstoragemgmt</packagereq>
       <packagereq type="default" variant="BaseOS">lvm2</packagereq>
@@ -1120,7 +1120,7 @@
       <packagereq type="default" variant="BaseOS">dosfstools</packagereq>
       <packagereq type="default" variant="BaseOS">ethtool</packagereq>
       <packagereq type="default" variant="BaseOS">gnupg2</packagereq>
-      <packagereq type="default" variant="BaseOS">iprutils</packagereq>
+      <packagereq type="default" arch="ppc64le" variant="BaseOS">iprutils</packagereq>
       <packagereq type="default" variant="BaseOS">ledmon</packagereq>
       <packagereq type="default" variant="AppStream">libstoragemgmt</packagereq>
       <packagereq type="default" variant="BaseOS">lvm2</packagereq>
@@ -3708,6 +3708,7 @@
       <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq type="default">libiptcdata-devel</packagereq>
+      <packagereq type="default">source-highlight-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index b09a795..67102b5 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+<?xml version="1.0"?>
 <comps>
   <group variant="BaseOS">
     <id>conflicts-baseos</id>
@@ -43,6 +42,7 @@
       <packagereq variant="AppStream">iptables-devel</packagereq>
       <packagereq variant="AppStream">libacl-devel</packagereq>
       <packagereq variant="AppStream">libaio-devel</packagereq>
+      <packagereq variant="AppStream">libarchive-devel</packagereq>
       <packagereq variant="AppStream">libattr-devel</packagereq>
       <packagereq variant="AppStream">libblkid-devel</packagereq>
       <packagereq variant="AppStream">libcap-devel</packagereq>
@@ -2248,6 +2248,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional" arch="aarch64,s390x,x86_64">dotnet-sdk-6.0</packagereq>
+      <packagereq type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
   
@@ -2730,7 +2731,6 @@
       <packagereq type="default">doxygen</packagereq>
       <packagereq type="default">doxygen-doxywizard</packagereq>
       <packagereq type="default">doxygen-latex</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">dpdk-devel</packagereq>
       <packagereq type="default">dtc</packagereq>
       <packagereq type="default">dwarves</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">dyninst-devel</packagereq>
@@ -2914,7 +2914,6 @@
       <packagereq type="default">libadwaita-devel</packagereq>
       <packagereq type="default">libao-devel</packagereq>
       <packagereq type="default">libappstream-glib-devel</packagereq>
-      <packagereq type="default">libarchive-devel</packagereq>
       <packagereq type="default">libassuan-devel</packagereq>
       <packagereq type="default">libasyncns-devel</packagereq>
       <packagereq type="default">libatasmart-devel</packagereq>
@@ -2925,6 +2924,7 @@
       <packagereq type="default">libbpf-devel</packagereq>
       <packagereq type="default">libbpf-static</packagereq>
       <packagereq type="default">libburn-devel</packagereq>
+      <packagereq type="default">libbytesize-devel</packagereq>
       <packagereq type="default">libcdio-devel</packagereq>
       <packagereq type="default">libcdio-paranoia-devel</packagereq>
       <packagereq type="default">libcdr-devel</packagereq>
@@ -3786,6 +3786,15 @@
       <packagereq type="default">yelp-devel</packagereq>
       <packagereq type="default">zlib-static</packagereq>
       <packagereq type="default">zziplib-devel</packagereq>
+      <packagereq type="default">ocaml-augeas</packagereq>
+      <packagereq type="default">egl-wayland-devel</packagereq>
+      <packagereq type="default">ocaml-augeas-devel</packagereq>
+      <packagereq type="default">ledmon-devel</packagereq>
+      <packagereq type="default">perl-libxml-perl</packagereq>
+      <packagereq type="default">libiptcdata-devel</packagereq>
+      <packagereq type="default">source-highlight-devel</packagereq>
+      <packagereq type="default">bind9.18-devel</packagereq>
+      <packagereq type="default">bind9.18-doc</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
@@ -4024,4 +4033,4 @@
       <groupid arch="x86_64">office-suite</groupid>
     </grouplist>
   </category>
-</comps>
\ No newline at end of file
+</comps>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index cc2d06a..ae5ac26 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -4035,6 +4035,9 @@
       <packagereq type="default">ledmon-devel</packagereq>
       <packagereq type="default">perl-libxml-perl</packagereq>
       <packagereq type="default">libiptcdata-devel</packagereq>
+      <packagereq type="default">source-highlight-devel</packagereq>
+      <packagereq type="default">bind9.18-devel</packagereq>
+      <packagereq type="default">bind9.18-doc</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">