From f5004b621a04ad84c6ee29f94efec5f044a97650 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 13 Mar 2025 19:38:07 -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 | 3 +--
comps-rocky-10-lh.xml.in | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 783197f..a81b916 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -600,7 +600,7 @@
<packagereq variant="BaseOS" type="default">NetworkManager-wifi</packagereq>
<packagereq variant="BaseOS" type="default">NetworkManager-bluetooth</packagereq>
<packagereq variant="BaseOS" type="default">NetworkManager-wwan</packagereq>
- <packagereq variant="BaseOS" type="default">iptables-nft</packagereq>
+ <packagereq variant="BaseOS" type="default">nftables</packagereq>
<packagereq variant="AppStream" type="default">dnsmasq</packagereq>
</packagelist>
</group>
@@ -778,7 +778,6 @@
<packagereq variant="AppStream" type="default">pcp-pmda-zswap</packagereq>
<packagereq variant="AppStream" type="default">pcp-selinux</packagereq>
<packagereq variant="AppStream" type="default">pcp-system-tools</packagereq>
- <packagereq variant="AppStream" type="default">pcp-testsuite</packagereq>
<packagereq variant="AppStream" type="default">grafana</packagereq>
<packagereq variant="AppStream" type="default">grafana-pcp</packagereq>
<packagereq variant="AppStream" type="default">pcp-zeroconf</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index ba88b33..1427d67 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -605,7 +605,7 @@
<packagereq type="default" variant="BaseOS">NetworkManager-wifi</packagereq>
<packagereq type="default" variant="BaseOS">NetworkManager-bluetooth</packagereq>
<packagereq type="default" variant="BaseOS">NetworkManager-wwan</packagereq>
- <packagereq type="default" variant="BaseOS">iptables-nft</packagereq>
+ <packagereq type="default" variant="BaseOS">nftables</packagereq>
<packagereq type="default" variant="AppStream">dnsmasq</packagereq>
</packagelist>
</group>
@@ -783,7 +783,6 @@
<packagereq type="default" variant="AppStream">pcp-pmda-zswap</packagereq>
<packagereq type="default" variant="AppStream">pcp-selinux</packagereq>
<packagereq type="default" variant="AppStream">pcp-system-tools</packagereq>
- <packagereq type="default" variant="AppStream">pcp-testsuite</packagereq>
<packagereq type="default" variant="AppStream">grafana</packagereq>
<packagereq type="default" variant="AppStream">grafana-pcp</packagereq>
<packagereq type="default" variant="AppStream">pcp-zeroconf</packagereq>
--
GitLab