rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Unwrap alternatives --install lines

Browse Source 
- Unwrap alternatives --install lines
- Related: RHEL-68848

The idea with this and the next few patches is that one can use Emacs
Occur mode or grep on the command line to list all alternative masters
by searching for "alternatives --install".
This commit is contained in:
Thomas Fitzsimmons 2024-09-25 17:36:26 -04:00
parent fb379dff95
commit 938f10155b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java-21-openjdk.spec
View File

@ -513,8 +513,7 @@ if [ "x$debug" == "xtrue" ] ; then
set -x set -x
fi fi
key=java key=java
alternatives \\ alternatives --install %{_bindir}/java $key %{jrebindir -- %{?1}}/java %{priority_for -- %{?1}} \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java %{priority_for -- %{?1}} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\ --slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\ --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
--slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
@ -580,8 +579,7 @@ if [ "x$debug" == "xtrue" ] ; then
set -x set -x
fi fi
key=javac key=javac
alternatives \\ alternatives --install %{_bindir}/javac $key %{sdkbindir -- %{?1}}/javac %{priority_for -- %{?1}} \\
--install %{_bindir}/javac $key %{sdkbindir -- %{?1}}/javac %{priority_for -- %{?1}} \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\ --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\ --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\ --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
@ -2438,6 +2436,7 @@ done
- Precompute alternative priorities at build time - Precompute alternative priorities at build time
- Remove extra newlines - Remove extra newlines
- Inline .gz for alternatives slave man pages - Inline .gz for alternatives slave man pages
- Unwrap alternatives --install lines
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild: