From 35c69c46d19b46a8cb4b4261aed55a906313447e Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 9 Oct 2024 17:43:24 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-10-lh.xml    | 6 +++++-
 comps-rocky-10-lh.xml.in | 6 +++++-
 comps-rocky-9-lh.xml     | 2 +-
 comps-rocky-9-lh.xml.in  | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 378396d..01f6169 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -2176,7 +2176,6 @@
     <packagelist>
       <packagereq type="mandatory">lvm2-lockd</packagereq>
       <packagereq type="default">cockpit-ha-cluster</packagereq>
-      <packagereq type="default">dlm</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">fence-agents-openstack</packagereq>
       <packagereq type="optional">ctdb</packagereq>
       <packagereq type="optional">resource-agents</packagereq>
@@ -2283,6 +2282,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default" arch="x86_64">accel-config-devel</packagereq>
+      <packagereq type="default">389-ds-base-bdb</packagereq>
       <packagereq type="default">389-ds-base-devel</packagereq>
       <packagereq type="default">accountsservice-devel</packagereq>
       <packagereq type="default">acpica-tools</packagereq>
@@ -2557,6 +2557,8 @@
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
       <packagereq type="default">libedit-devel</packagereq>
+      <packagereq type="default">libei-devel</packagereq>
+      <packagereq type="default">libeis-devel</packagereq>
       <packagereq type="default">libestr-devel</packagereq>
       <packagereq type="default">libevdev-devel</packagereq>
       <packagereq type="default">libev-devel</packagereq>
@@ -2621,6 +2623,7 @@
       <packagereq type="default">libnvme-devel</packagereq>
       <packagereq type="default" arch="ppc64le">libnxz-devel</packagereq>
       <packagereq type="default" arch="ppc64le">libocxl-devel</packagereq>
+      <packagereq type="default">liboeffis-devel</packagereq>
       <packagereq type="default">libogg-devel</packagereq>
       <packagereq type="default">libogg-devel-docs</packagereq>
       <packagereq type="default">libopenraw-devel</packagereq>
@@ -2981,6 +2984,7 @@
       <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
       <packagereq type="default">postgresql-upgrade-devel</packagereq>
+      <packagereq type="default">postgresql-test-rpm-macros</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">procps-ng-devel</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 5ae31df..592960b 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -2403,7 +2403,6 @@
     <packagelist>
       <packagereq type="mandatory">lvm2-lockd</packagereq>
       <packagereq type="default">cockpit-ha-cluster</packagereq>
-      <packagereq type="default">dlm</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">fence-agents-openstack</packagereq>
       <packagereq type="optional">ctdb</packagereq>
       <packagereq type="optional">resource-agents</packagereq>
@@ -2510,6 +2509,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default" arch="x86_64">accel-config-devel</packagereq>
+      <packagereq type="default">389-ds-base-bdb</packagereq>
       <packagereq type="default">389-ds-base-devel</packagereq>
       <packagereq type="default">accountsservice-devel</packagereq>
       <packagereq type="default">acpica-tools</packagereq>
@@ -2784,6 +2784,8 @@
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
       <packagereq type="default">libedit-devel</packagereq>
+      <packagereq type="default">libei-devel</packagereq>
+      <packagereq type="default">libeis-devel</packagereq>
       <packagereq type="default">libestr-devel</packagereq>
       <packagereq type="default">libevdev-devel</packagereq>
       <packagereq type="default">libev-devel</packagereq>
@@ -2848,6 +2850,7 @@
       <packagereq type="default">libnvme-devel</packagereq>
       <packagereq type="default" arch="ppc64le">libnxz-devel</packagereq>
       <packagereq type="default" arch="ppc64le">libocxl-devel</packagereq>
+      <packagereq type="default">liboeffis-devel</packagereq>
       <packagereq type="default">libogg-devel</packagereq>
       <packagereq type="default">libogg-devel-docs</packagereq>
       <packagereq type="default">libopenraw-devel</packagereq>
@@ -3208,6 +3211,7 @@
       <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
       <packagereq type="default">postgresql-upgrade-devel</packagereq>
+      <packagereq type="default">postgresql-test-rpm-macros</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">procps-ng-devel</packagereq>
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index 72bbfa4..52b745b 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2822,7 +2822,6 @@
       <packagereq type="default">gnome-software-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">golang-github-cpuguy83-md2man-devel</packagereq>
       <packagereq type="default">google-noto-kufi-arabic-fonts</packagereq>
       <packagereq type="default">google-noto-kufi-arabic-vf-fonts</packagereq>
       <packagereq type="default">google-noto-music-fonts</packagereq>
@@ -3807,6 +3806,7 @@
       <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
       <packagereq type="default">postgresql-upgrade-devel</packagereq>
+      <packagereq type="default">postgresql-test-rpm-macros</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">procps-ng-devel</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index d1debe5..3f58653 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -3076,7 +3076,6 @@
       <packagereq type="default">gnome-software-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">golang-github-cpuguy83-md2man</packagereq>
-      <packagereq type="default">golang-github-cpuguy83-md2man-devel</packagereq>
       <packagereq type="default">google-noto-kufi-arabic-fonts</packagereq>
       <packagereq type="default">google-noto-kufi-arabic-vf-fonts</packagereq>
       <packagereq type="default">google-noto-music-fonts</packagereq>
@@ -4061,6 +4060,7 @@
       <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
       <packagereq type="default">postgresql-upgrade-devel</packagereq>
+      <packagereq type="default">postgresql-test-rpm-macros</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">procps-ng-devel</packagereq>