From 4a27372142204eb24b6182121b39df42ea360459 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 10 Nov 2024 18:41:50 -0700
Subject: [PATCH] sync from upstream

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

diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index ecfbf32..480a5f1 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -2412,6 +2412,7 @@
       <packagereq type="default">colord-devel</packagereq>
       <packagereq type="default">colord-devel-docs</packagereq>
       <packagereq type="default">colord-gtk-devel</packagereq>
+      <packagereq type="default">composefs-devel</packagereq>
       <packagereq type="default">corosync-vqsim</packagereq>
       <packagereq type="default">cppunit-devel</packagereq>
       <packagereq type="default">cracklib-devel</packagereq>
@@ -3304,6 +3305,7 @@
       <packagereq type="default">libiptcdata-devel</packagereq>
       <packagereq type="default">source-highlight-devel</packagereq>
       <packagereq type="default" arch="x86_64">rust-std-static-x86_64-unknown-none</packagereq>
+      <packagereq type="default" arch="aarch64">rust-std-static-aarch64-unknown-none-softfloat</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 40a61aa..04c1b5b 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -2605,6 +2605,7 @@
       <packagereq type="default">colord-devel</packagereq>
       <packagereq type="default">colord-devel-docs</packagereq>
       <packagereq type="default">colord-gtk-devel</packagereq>
+      <packagereq type="default">composefs-devel</packagereq>
       <packagereq type="default">corosync-vqsim</packagereq>
       <packagereq type="default">cppunit-devel</packagereq>
       <packagereq type="default">cracklib-devel</packagereq>
@@ -3497,6 +3498,7 @@
       <packagereq type="default">libiptcdata-devel</packagereq>
       <packagereq type="default">source-highlight-devel</packagereq>
       <packagereq type="default" arch="x86_64">rust-std-static-x86_64-unknown-none</packagereq>
+      <packagereq type="default" arch="aarch64">rust-std-static-aarch64-unknown-none-softfloat</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 c88d271..918a96f 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2030,15 +2030,9 @@
       <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>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 0892b4a..b33225b 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -2093,15 +2093,9 @@
       <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>