From 0c8edf53267eb6e60af6f9bfb56af4c0c88cc629 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 15 Jan 2025 18:06:27 -0700
Subject: [PATCH] sync from upstream
---
comps-rocky-10-lh.xml.in | 3 +++
comps-rocky-9-lh.xml | 26 +++++++++++++++++++++++---
comps-rocky-9-lh.xml.in | 26 +++++++++++++++++++++++---
3 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 51b1e79..9895d13 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -266,6 +266,7 @@
<packagereq type="default" variant="AppStream">python3-libselinux</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
+ <rhel_only><packagereq variant="AppStream">rhc-compat</packagereq></rhel_only>
<packagereq type="optional" variant="BaseOS">dracut-config-generic</packagereq>
<packagereq type="optional" variant="BaseOS">dracut-network</packagereq>
<packagereq type="optional" variant="BaseOS" arch="s390x">libzfcphbaapi</packagereq>
@@ -1061,6 +1062,7 @@
<packagereq type="default" variant="AppStream">vim-enhanced</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
+ <rhel_only><packagereq variant="AppStream">rhc-compat</packagereq></rhel_only>
</packagelist>
</group>
<group>
@@ -1166,6 +1168,7 @@
<packagereq type="default" variant="AppStream">vim-enhanced</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
+ <rhel_only><packagereq variant="AppStream">rhc-compat</packagereq></rhel_only>
</packagelist>
</group>
<group>
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index bd32ea9..dc87f28 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2031,9 +2031,15 @@
<packagereq type="default">java-17-openjdk-src</packagereq>
<packagereq type="default">java-17-openjdk-static-libs</packagereq>
<packagereq type="default">maven</packagereq>
+ <packagereq type="default">maven-openjdk8</packagereq>
+ <packagereq type="default">maven-openjdk11</packagereq>
<packagereq type="default">maven-openjdk17</packagereq>
+ <packagereq type="default">maven-openjdk21</packagereq>
<packagereq type="default">ant</packagereq>
+ <packagereq type="default">ant-openjdk8</packagereq>
+ <packagereq type="default">ant-openjdk11</packagereq>
<packagereq type="default">ant-openjdk17</packagereq>
+ <packagereq type="default">ant-openjdk21</packagereq>
<packagereq type="default">ant-antlr</packagereq>
<packagereq type="default">ant-apache-bcel</packagereq>
<packagereq type="default">ant-apache-bsf</packagereq>
@@ -2634,6 +2640,8 @@
<packagereq type="default">adwaita-icon-theme-devel</packagereq>
<packagereq type="default">anaconda-widgets-devel</packagereq>
<packagereq type="default">ant-junit</packagereq>
+ <packagereq type="default">ant-manual</packagereq>
+ <packagereq type="default">ant-unbound</packagereq>
<packagereq type="default">anthy-unicode-devel</packagereq>
<packagereq type="default">antlr-C++</packagereq>
<packagereq type="default">antlr-tool</packagereq>
@@ -3141,7 +3149,11 @@
<packagereq type="default">iso-codes-devel</packagereq>
<packagereq type="default">jansson-devel</packagereq>
<packagereq type="default">jasper-devel</packagereq>
- <packagereq type="default">javapackages-local</packagereq>
+ <packagereq type="default">javapackages-compat</packagereq>
+ <packagereq type="default">javapackages-local-openjdk8</packagereq>
+ <packagereq type="default">javapackages-local-openjdk11</packagereq>
+ <packagereq type="default">javapackages-local-openjdk17</packagereq>
+ <packagereq type="default">javapackages-local-openjdk21</packagereq>
<packagereq type="default">java-21-openjdk-demo-slowdebug</packagereq>
<packagereq type="default">java-21-openjdk-devel-slowdebug</packagereq>
<packagereq type="default">java-21-openjdk-headless-slowdebug</packagereq>
@@ -3242,7 +3254,7 @@
<packagereq type="default">libfido2-devel</packagereq>
<packagereq type="default">libfontenc-devel</packagereq>
<packagereq type="default">libfreehand-devel</packagereq>
- <packagereq type="default">libfprint-devel</packagereq>
+ <packagereq type="default" arch="aarch64,ppc64le,x86_64">libfprint-devel</packagereq>
<packagereq type="default">libgee-devel</packagereq>
<packagereq type="default">libgexiv2-devel</packagereq>
<packagereq type="default">libgnomekbd-devel</packagereq>
@@ -3456,7 +3468,10 @@
<packagereq type="default">maven-enforcer-rules</packagereq>
<packagereq type="default">maven-filtering</packagereq>
<packagereq type="default">maven-jar-plugin</packagereq>
- <packagereq type="default">maven-local</packagereq>
+ <packagereq type="default">maven-local-openjdk8</packagereq>
+ <packagereq type="default">maven-local-openjdk11</packagereq>
+ <packagereq type="default">maven-local-openjdk17</packagereq>
+ <packagereq type="default">maven-local-openjdk21</packagereq>
<packagereq type="default">maven-plugin-annotations</packagereq>
<packagereq type="default">maven-plugin-build-helper</packagereq>
<packagereq type="default">maven-plugin-bundle</packagereq>
@@ -3471,6 +3486,7 @@
<packagereq type="default">maven-surefire-provider-junit</packagereq>
<packagereq type="default">maven-surefire-provider-junit5</packagereq>
<packagereq type="default">maven-surefire-provider-testng</packagereq>
+ <packagereq type="default">maven-unbound</packagereq>
<packagereq type="default">maven-verifier</packagereq>
<packagereq type="default">mecab-devel</packagereq>
<packagereq type="default" arch="aarch64,ppc64le,x86_64">memkind-devel</packagereq>
@@ -4050,6 +4066,10 @@
<packagereq type="default">xmvn-core</packagereq>
<packagereq type="default">xmvn-minimal</packagereq>
<packagereq type="default">xmvn-mojo</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk8</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk11</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk17</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk21</packagereq>
<packagereq type="default">xmvn-tools</packagereq>
<packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
<packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 5a2930a..0f271ab 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -2094,9 +2094,15 @@
<packagereq type="default">java-17-openjdk-src</packagereq>
<packagereq type="default">java-17-openjdk-static-libs</packagereq>
<packagereq type="default">maven</packagereq>
+ <packagereq type="default">maven-openjdk8</packagereq>
+ <packagereq type="default">maven-openjdk11</packagereq>
<packagereq type="default">maven-openjdk17</packagereq>
+ <packagereq type="default">maven-openjdk21</packagereq>
<packagereq type="default">ant</packagereq>
+ <packagereq type="default">ant-openjdk8</packagereq>
+ <packagereq type="default">ant-openjdk11</packagereq>
<packagereq type="default">ant-openjdk17</packagereq>
+ <packagereq type="default">ant-openjdk21</packagereq>
<packagereq type="default">ant-antlr</packagereq>
<packagereq type="default">ant-apache-bcel</packagereq>
<packagereq type="default">ant-apache-bsf</packagereq>
@@ -2888,6 +2894,8 @@
<packagereq type="default">adwaita-icon-theme-devel</packagereq>
<packagereq type="default">anaconda-widgets-devel</packagereq>
<packagereq type="default">ant-junit</packagereq>
+ <packagereq type="default">ant-manual</packagereq>
+ <packagereq type="default">ant-unbound</packagereq>
<packagereq type="default">anthy-unicode-devel</packagereq>
<packagereq type="default">antlr-C++</packagereq>
<packagereq type="default">antlr-tool</packagereq>
@@ -3395,7 +3403,11 @@
<packagereq type="default">iso-codes-devel</packagereq>
<packagereq type="default">jansson-devel</packagereq>
<packagereq type="default">jasper-devel</packagereq>
- <packagereq type="default">javapackages-local</packagereq>
+ <packagereq type="default">javapackages-compat</packagereq>
+ <packagereq type="default">javapackages-local-openjdk8</packagereq>
+ <packagereq type="default">javapackages-local-openjdk11</packagereq>
+ <packagereq type="default">javapackages-local-openjdk17</packagereq>
+ <packagereq type="default">javapackages-local-openjdk21</packagereq>
<packagereq type="default">java-21-openjdk-demo-slowdebug</packagereq>
<packagereq type="default">java-21-openjdk-devel-slowdebug</packagereq>
<packagereq type="default">java-21-openjdk-headless-slowdebug</packagereq>
@@ -3496,7 +3508,7 @@
<packagereq type="default">libfido2-devel</packagereq>
<packagereq type="default">libfontenc-devel</packagereq>
<packagereq type="default">libfreehand-devel</packagereq>
- <packagereq type="default">libfprint-devel</packagereq>
+ <packagereq type="default" arch="aarch64,ppc64le,x86_64">libfprint-devel</packagereq>
<packagereq type="default">libgee-devel</packagereq>
<packagereq type="default">libgexiv2-devel</packagereq>
<packagereq type="default">libgnomekbd-devel</packagereq>
@@ -3710,7 +3722,10 @@
<packagereq type="default">maven-enforcer-rules</packagereq>
<packagereq type="default">maven-filtering</packagereq>
<packagereq type="default">maven-jar-plugin</packagereq>
- <packagereq type="default">maven-local</packagereq>
+ <packagereq type="default">maven-local-openjdk8</packagereq>
+ <packagereq type="default">maven-local-openjdk11</packagereq>
+ <packagereq type="default">maven-local-openjdk17</packagereq>
+ <packagereq type="default">maven-local-openjdk21</packagereq>
<packagereq type="default">maven-plugin-annotations</packagereq>
<packagereq type="default">maven-plugin-build-helper</packagereq>
<packagereq type="default">maven-plugin-bundle</packagereq>
@@ -3725,6 +3740,7 @@
<packagereq type="default">maven-surefire-provider-junit</packagereq>
<packagereq type="default">maven-surefire-provider-junit5</packagereq>
<packagereq type="default">maven-surefire-provider-testng</packagereq>
+ <packagereq type="default">maven-unbound</packagereq>
<packagereq type="default">maven-verifier</packagereq>
<packagereq type="default">mecab-devel</packagereq>
<packagereq type="default" arch="aarch64,ppc64le,x86_64">memkind-devel</packagereq>
@@ -4305,6 +4321,10 @@
<packagereq type="default">xmvn-core</packagereq>
<packagereq type="default">xmvn-minimal</packagereq>
<packagereq type="default">xmvn-mojo</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk8</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk11</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk17</packagereq>
+ <packagereq type="default">xmvn-toolchain-openjdk21</packagereq>
<packagereq type="default">xmvn-tools</packagereq>
<packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
<packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
--
GitLab