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

Remove exit 0 from alternatives scriptlets

Browse Source 
- Remove exit 0 from alternatives scriptlets
- Related: RHEL-68848
This commit is contained in:
Thomas Fitzsimmons 2024-09-25 18:05:32 -04:00
parent bbb8d622ae
commit 3523fc4a64
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-21-openjdk.spec
View File

@ -675,7 +675,6 @@ alternatives --install %{_javadocdir}/java-%{origin} javadocdir_%{origin} %{_jav
alternatives --install %{_javadocdir}/java-%{javaver} javadocdir_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}} alternatives --install %{_javadocdir}/java-%{javaver} javadocdir_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}}
alternatives --install %{_javadocdir}/java-%{javaver}-%{origin} javadocdir_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}} alternatives --install %{_javadocdir}/java-%{javaver}-%{origin} javadocdir_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}}
alternatives --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}} alternatives --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api %{priority_for -- %{?1}}
exit 0
} }
%define preun_javadoc() %{expand: %define preun_javadoc() %{expand:
@ -689,7 +688,6 @@ then
alternatives --remove javadocdir_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api alternatives --remove javadocdir_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api
alternatives --remove javadocdir_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api alternatives --remove javadocdir_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}/api
fi fi
exit 0
} }
%define alternatives_javadoczip_install() %{expand: %define alternatives_javadoczip_install() %{expand:
@ -701,7 +699,6 @@ alternatives --install %{_javadocdir}/java-%{javaver}.zip javadoczip_%{javaver}
alternatives --install %{_javadocdir}/java-%{javaver}-%{origin}.zip javadoczip_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip %{priority_for -- %{?1}} alternatives --install %{_javadocdir}/java-%{javaver}-%{origin}.zip javadoczip_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip %{priority_for -- %{?1}}
# Weird legacy filename for backwards-compatibility # Weird legacy filename for backwards-compatibility
alternatives --install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip %{priority_for -- %{?1}} alternatives --install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip %{priority_for -- %{?1}}
exit 0
} }
%define preun_javadoc_zip() %{expand: %define preun_javadoc_zip() %{expand:
@ -715,7 +712,6 @@ then
alternatives --remove javadoczip_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip alternatives --remove javadoczip_%{javaver} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
alternatives --remove javadoczip_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip alternatives --remove javadoczip_%{javaver}_%{origin} %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
fi fi
exit 0
} }
%define files_jre() %{expand: %define files_jre() %{expand:
@ -2391,6 +2387,7 @@ done
- Unwrap alternatives --install lines - Unwrap alternatives --install lines
- Remove set_if_needed_alternatives - Remove set_if_needed_alternatives
- Unroll alternatives --install loops - Unroll alternatives --install loops
- Remove exit 0 from alternatives scriptlets
* 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: