From 1c8ba4153b25894443cf7a858f32e4326a9c4849 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 17 Sep 2024 20:01:37 -0700
Subject: [PATCH] sync from upstream
---
comps-rocky-10-lh.xml | 5 +----
comps-rocky-10-lh.xml.in | 5 +----
comps-rocky-9-lh.xml | 1 -
comps-rocky-9-lh.xml.in | 1 -
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 7585628..12fabfe 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -918,7 +918,6 @@
<packagereq variant="BaseOS" type="optional" arch="s390x">opencryptoki-ep11tok</packagereq>
<packagereq variant="BaseOS" type="optional" arch="s390x">opencryptoki-icatok</packagereq>
<packagereq variant="BaseOS" type="optional">opensc</packagereq>
- <packagereq variant="BaseOS" type="optional">openssl-pkcs11</packagereq>
<packagereq variant="BaseOS" type="optional">sssd-common</packagereq>
</packagelist>
</group>
@@ -1595,7 +1594,6 @@
<packagereq variant="AppStream">hunspell</packagereq>
<packagereq variant="AppStream">ibus-anthy</packagereq>
<packagereq variant="AppStream">ibus-gtk3</packagereq>
- <packagereq variant="AppStream">ibus-gtk4</packagereq>
<packagereq variant="AppStream">ibus-hangul</packagereq>
<packagereq variant="AppStream">ibus-libpinyin</packagereq>
<packagereq variant="AppStream">ibus-libzhuyin</packagereq>
@@ -2961,7 +2959,6 @@
<packagereq type="default">plexus-archiver</packagereq>
<packagereq type="default">plexus-build-api0</packagereq>
<packagereq type="default">plexus-compiler</packagereq>
- <packagereq type="default">plexus-containers-container-default</packagereq>
<packagereq type="default">plexus-io</packagereq>
<packagereq type="default">plexus-languages</packagereq>
<packagereq type="default">plexus-resources</packagereq>
@@ -3240,7 +3237,7 @@
<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" arch="x86_64">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>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 030faf6..19df5c7 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -923,7 +923,6 @@
<packagereq type="optional" arch="s390x" variant="BaseOS">opencryptoki-ep11tok</packagereq>
<packagereq type="optional" arch="s390x" variant="BaseOS">opencryptoki-icatok</packagereq>
<packagereq type="optional" variant="BaseOS">opensc</packagereq>
- <packagereq type="optional" variant="BaseOS">openssl-pkcs11</packagereq>
<packagereq type="optional" variant="BaseOS">sssd-common</packagereq>
</packagelist>
</group>
@@ -1608,7 +1607,6 @@
<packagereq variant="AppStream">hunspell</packagereq>
<packagereq variant="AppStream">ibus-anthy</packagereq>
<packagereq variant="AppStream">ibus-gtk3</packagereq>
- <packagereq variant="AppStream">ibus-gtk4</packagereq>
<packagereq variant="AppStream">ibus-hangul</packagereq>
<packagereq variant="AppStream">ibus-libpinyin</packagereq>
<packagereq variant="AppStream">ibus-libzhuyin</packagereq>
@@ -3188,7 +3186,6 @@
<packagereq type="default">plexus-archiver</packagereq>
<packagereq type="default">plexus-build-api0</packagereq>
<packagereq type="default">plexus-compiler</packagereq>
- <packagereq type="default">plexus-containers-container-default</packagereq>
<packagereq type="default">plexus-io</packagereq>
<packagereq type="default">plexus-languages</packagereq>
<packagereq type="default">plexus-resources</packagereq>
@@ -3467,7 +3464,7 @@
<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" arch="x86_64">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>
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index c1c3e61..35a55ee 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -3510,7 +3510,6 @@
<packagereq type="default">plexus-archiver</packagereq>
<packagereq type="default">plexus-build-api</packagereq>
<packagereq type="default">plexus-compiler</packagereq>
- <packagereq type="default">plexus-containers-container-default</packagereq>
<packagereq type="default">plexus-io</packagereq>
<packagereq type="default">plexus-languages</packagereq>
<packagereq type="default">plexus-resources</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index fcafae1..9341ea2 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -3764,7 +3764,6 @@
<packagereq type="default">plexus-archiver</packagereq>
<packagereq type="default">plexus-build-api</packagereq>
<packagereq type="default">plexus-compiler</packagereq>
- <packagereq type="default">plexus-containers-container-default</packagereq>
<packagereq type="default">plexus-io</packagereq>
<packagereq type="default">plexus-languages</packagereq>
<packagereq type="default">plexus-resources</packagereq>
--
GitLab