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

Move alternatives installation from posttrans to post

Browse Source 
- Move alternatives installation from posttrans to post
- Related: RHEL-68848
This commit is contained in:
Thomas Fitzsimmons 2024-09-26 14:27:16 -04:00
parent 3523fc4a64
commit bad655b906
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java-21-openjdk.spec
View File

@ -524,6 +524,7 @@ alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{orig
} }
%define post_headless() %{expand: %define post_headless() %{expand:
%{alternatives_java_install -- %{?1}}
update-desktop-database %{_datadir}/applications &> /dev/null || : update-desktop-database %{_datadir}/applications &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
} }
@ -630,6 +631,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_
} }
%define post_devel() %{expand: %define post_devel() %{expand:
%{alternatives_javac_install -- %{?1}}
update-desktop-database %{_datadir}/applications &> /dev/null || : update-desktop-database %{_datadir}/applications &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -663,7 +665,6 @@ exit 0
} }
%define posttrans_devel() %{expand: %define posttrans_devel() %{expand:
%{alternatives_javac_install -- %{?1}}
%{update_desktop_icons} %{update_desktop_icons}
} }
@ -2189,9 +2190,6 @@ done
%posttrans %posttrans
%{posttrans_script %{nil}} %{posttrans_script %{nil}}
%posttrans headless
%{alternatives_java_install %{nil}}
%post devel %post devel
%{post_devel %{nil}} %{post_devel %{nil}}
@ -2204,13 +2202,13 @@ done
%posttrans devel %posttrans devel
%{posttrans_devel %{nil}} %{posttrans_devel %{nil}}
%posttrans javadoc %post javadoc
%{alternatives_javadoc_install %{nil}} %{alternatives_javadoc_install %{nil}}
%preun javadoc %preun javadoc
%{preun_javadoc %{nil}} %{preun_javadoc %{nil}}
%posttrans javadoc-zip %post javadoc-zip
%{alternatives_javadoczip_install %{nil}} %{alternatives_javadoczip_install %{nil}}
%preun javadoc-zip %preun javadoc-zip
@ -2224,9 +2222,6 @@ done
%post headless-slowdebug %post headless-slowdebug
%{post_headless -- %{debug_suffix_unquoted}} %{post_headless -- %{debug_suffix_unquoted}}
%posttrans headless-slowdebug
%{alternatives_java_install -- %{debug_suffix_unquoted}}
%postun slowdebug %postun slowdebug
%{postun_script -- %{debug_suffix_unquoted}} %{postun_script -- %{debug_suffix_unquoted}}
@ -2265,9 +2260,6 @@ done
%posttrans fastdebug %posttrans fastdebug
%{posttrans_script -- %{fastdebug_suffix_unquoted}} %{posttrans_script -- %{fastdebug_suffix_unquoted}}
%posttrans headless-fastdebug
%{alternatives_java_install -- %{fastdebug_suffix_unquoted}}
%post devel-fastdebug %post devel-fastdebug
%{post_devel -- %{fastdebug_suffix_unquoted}} %{post_devel -- %{fastdebug_suffix_unquoted}}
@ -2388,6 +2380,7 @@ done
- Remove set_if_needed_alternatives - Remove set_if_needed_alternatives
- Unroll alternatives --install loops - Unroll alternatives --install loops
- Remove exit 0 from alternatives scriptlets - Remove exit 0 from alternatives scriptlets
- Move alternatives installation from posttrans to post
* 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: