From 41185b81bfee7bf23a931a4336c4d085d5dba7cd Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Wed, 25 Sep 2024 13:43:37 -0400
Subject: [PATCH] Remove --family arguments to alternatives --install

- Remove --family arguments to alternatives --install
- Related: RHEL-68848
---
 java-21-openjdk.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 9619b0c..45b452d 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -519,7 +519,7 @@ fi
 ext=.gz
 key=java
 alternatives \\
-  --install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY  --family %{family} \\
+  --install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY \\
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
   --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
   --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
@@ -540,12 +540,12 @@ alternatives \\
 
 for X in %{origin} %{javaver} ; do
   key=jre_"$X"
-  alternatives --install %{_jvmdir}/jre-"$X" $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family %{family}
+  alternatives --install %{_jvmdir}/jre-"$X" $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY
   %{set_if_needed_alternatives $key %{family}}
 done
 
 key=jre_%{javaver}_%{origin}
-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} $key %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY  --family %{family}
+alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} $key %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY
 %{set_if_needed_alternatives $key %{family}}
 }
 
@@ -594,7 +594,7 @@ fi
 ext=.gz
 key=javac
 alternatives \\
-  --install %{_bindir}/javac $key %{sdkbindir -- %{?1}}/javac $PRIORITY  --family %{family} \\
+  --install %{_bindir}/javac $key %{sdkbindir -- %{?1}}/javac $PRIORITY \\
   --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
   --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
   --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
@@ -665,12 +665,12 @@ alternatives \\
 
 for X in %{origin} %{javaver} ; do
   key=java_sdk_"$X"
-  alternatives --install %{_jvmdir}/java-"$X" $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY  --family %{family}
+  alternatives --install %{_jvmdir}/java-"$X" $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY
   %{set_if_needed_alternatives  $key %{family}}
 done
 
 key=java_sdk_%{javaver}_%{origin}
-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY  --family %{family}
+alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY
 %{set_if_needed_alternatives  $key %{family}}
 }
 
@@ -722,16 +722,16 @@ if [ "%{?1}" == %{debug_suffix} ]; then
 fi
   for X in %{origin} %{javaver} ; do
     key=javadocdir_"$X"
-    alternatives --install %{_javadocdir}/java-"$X" $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY --family %{family_noarch}
+    alternatives --install %{_javadocdir}/java-"$X" $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY
     %{set_if_needed_alternatives $key %{family_noarch}}
   done
 
   key=javadocdir_%{javaver}_%{origin}
-  alternatives --install %{_javadocdir}/java-%{javaver}-%{origin} $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY --family %{family_noarch}
+  alternatives --install %{_javadocdir}/java-%{javaver}-%{origin} $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY
   %{set_if_needed_alternatives  $key %{family_noarch}}
 
   key=javadocdir
-  alternatives --install %{_javadocdir}/java $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY --family %{family_noarch}
+  alternatives --install %{_javadocdir}/java $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api $PRIORITY
   %{set_if_needed_alternatives  $key %{family_noarch}}
 exit 0
 }
@@ -760,17 +760,17 @@ if [ "%{?1}" == %{debug_suffix} ]; then
 fi
   for X in %{origin} %{javaver} ; do
     key=javadoczip_"$X"
-    alternatives --install %{_javadocdir}/java-"$X".zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY --family %{family_noarch}
+    alternatives --install %{_javadocdir}/java-"$X".zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY
     %{set_if_needed_alternatives $key %{family_noarch}}
   done
 
   key=javadoczip_%{javaver}_%{origin}
-  alternatives --install %{_javadocdir}/java-%{javaver}-%{origin}.zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY --family %{family_noarch}
+  alternatives --install %{_javadocdir}/java-%{javaver}-%{origin}.zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY
   %{set_if_needed_alternatives  $key %{family_noarch}}
 
   # Weird legacy filename for backwards-compatibility
   key=javadoczip
-  alternatives --install %{_javadocdir}/java-zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY  --family %{family_noarch}
+  alternatives --install %{_javadocdir}/java-zip $key %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip $PRIORITY
   %{set_if_needed_alternatives  $key %{family_noarch}}
 exit 0
 }
@@ -2458,6 +2458,7 @@ done
 - Remove copy-jdk-configs logic
 - Remove alternatives removal special handling
 - Move postun alternatives logic to preun
+- Remove --family arguments to alternatives --install
 
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1
 - Bump release for October 2024 mass rebuild: