From ed1669fb4c41e760e60cd853171c5349b3bbeed5 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 10 Nov 2024 20:11:34 -0700
Subject: [PATCH] sync from upstream
---
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 480a5f1..3cd732e 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -914,7 +914,7 @@
<packagereq variant="BaseOS" type="optional">opencryptoki</packagereq>
<packagereq variant="BaseOS" type="optional">opencryptoki-icsftok</packagereq>
<packagereq variant="BaseOS" type="optional">opencryptoki-swtok</packagereq>
- <packagereq variant="BaseOS" type="optional" arch="s390x">opencryptoki-ccatok</packagereq>
+ <packagereq variant="BaseOS" type="optional" arch="s390x,ppc64le,x86_64">opencryptoki-ccatok</packagereq>
<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>
@@ -2435,7 +2435,6 @@
<packagereq type="default" arch="aarch64,ppc64le,s390x,x86_64">dotnet-sdk-8.0-source-built-artifacts</packagereq>
<packagereq type="default">dovecot-devel</packagereq>
<packagereq type="default">doxygen</packagereq>
- <packagereq type="default">doxygen-doxywizard</packagereq>
<packagereq type="default">doxygen-latex</packagereq>
<packagereq type="default">dtc</packagereq>
<packagereq type="default">dwarves</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 04c1b5b..016d2ec 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -919,7 +919,7 @@
<packagereq type="optional" variant="BaseOS">opencryptoki</packagereq>
<packagereq type="optional" variant="BaseOS">opencryptoki-icsftok</packagereq>
<packagereq type="optional" variant="BaseOS">opencryptoki-swtok</packagereq>
- <packagereq type="optional" arch="s390x" variant="BaseOS">opencryptoki-ccatok</packagereq>
+ <packagereq type="optional" arch="s390x,ppc64le,x86_64" variant="BaseOS">opencryptoki-ccatok</packagereq>
<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>
@@ -2628,7 +2628,6 @@
<packagereq type="default" arch="aarch64,ppc64le,s390x,x86_64">dotnet-sdk-8.0-source-built-artifacts</packagereq>
<packagereq type="default">dovecot-devel</packagereq>
<packagereq type="default">doxygen</packagereq>
- <packagereq type="default">doxygen-doxywizard</packagereq>
<packagereq type="default">doxygen-latex</packagereq>
<packagereq type="default">dtc</packagereq>
<packagereq type="default">dwarves</packagereq>
--
GitLab