From a40ffe21eb1c3d0177e91b7d39be977c9fc9ace8 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Tue, 6 Sep 2022 22:27:53 -0400 Subject: [PATCH] bugfix about macros --- java-11-alibaba-dragonwell.spec | 35 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index 987ec11..1bc597b 100644 --- a/java-11-alibaba-dragonwell.spec +++ b/java-11-alibaba-dragonwell.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without fastdebug %bcond_without slowdebug @@ -961,8 +961,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : post_state=$1 %{save_and_remove_alternatives javac %{sdkbindir}/javac $post_state %{family}} %{save_and_remove_alternatives java_sdk_%{origin} %{_jvmdir}/%{sdkdir} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver} %{_jvmdir}/%{sdkdir} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver} %{_jvmdir}/%{sdkdir} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver}_%{origin} %{_jvmdir}/%{sdkdir} $post_state %{family}} update-desktop-database %{_datadir}/applications &> /dev/null || : @@ -1042,14 +1042,14 @@ alternatives \ %{set_if_needed_alternatives $key %{family}} -for X in %{origin} %{javaver} ; do +for X in %{origin} %{major_ver} ; do key=java_sdk_"$X" alternatives --install %{_jvmdir}/java-"$X" $key %{_jvmdir}/%{sdkdir} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} done -key=java_sdk_%{javaver}_%{origin} -alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sdkdir} $PRIORITY --family %{family} +key=java_sdk_%{major_ver}_%{origin} +alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{sdkdir} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} %{update_desktop_icons} @@ -1165,8 +1165,8 @@ fi post_state=$1 %{save_and_remove_alternatives javac %{sdkbindir -- %{slowdebug_build}}/javac $post_state %{family}} %{save_and_remove_alternatives java_sdk_%{origin} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver}_%{origin} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $post_state %{family}} update-desktop-database %{_datadir}/applications &> /dev/null || : @@ -1251,14 +1251,14 @@ alternatives \ %{set_if_needed_alternatives $key %{family}} -for X in %{origin} %{javaver} ; do +for X in %{origin} %{major_ver} ; do key=java_sdk_"$X" alternatives --install %{_jvmdir}/java-"$X" $key %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} done -key=java_sdk_%{javaver}_%{origin} -alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $PRIORITY --family %{family} +key=java_sdk_%{major_ver}_%{origin} +alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{slowdebug_build}} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} %{update_desktop_icons} @@ -1353,8 +1353,8 @@ fi post_state=$1 %{save_and_remove_alternatives javac %{sdkbindir -- %{fastdebug_build}}/javac $post_state %{family}} %{save_and_remove_alternatives java_sdk_%{origin} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $post_state %{family}} -%{save_and_remove_alternatives java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $post_state %{family}} +%{save_and_remove_alternatives java_sdk_%{major_ver}_%{origin} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $post_state %{family}} update-desktop-database %{_datadir}/applications &> /dev/null || : @@ -1439,14 +1439,14 @@ alternatives \ %{set_if_needed_alternatives $key %{family}} -for X in %{origin} %{javaver} ; do +for X in %{origin} %{major_ver} ; do key=java_sdk_"$X" alternatives --install %{_jvmdir}/java-"$X" $key %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} done -key=java_sdk_%{javaver}_%{origin} -alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $PRIORITY --family %{family} +key=java_sdk_%{major_ver}_%{origin} +alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{sdkdir -- %{fastdebug_build}} $PRIORITY --family %{family} %{set_if_needed_alternatives $key %{family}} %{update_desktop_icons} @@ -2082,6 +2082,9 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Wed Sep 07 2022 happy_orange - 1:11.0.16.12.8-2 +- bugfix about java-11 + * Wed Aug 31 2022 happy_orange - 1:11.0.16.12.8-1 - update to 11.0.16.12.8 -- Gitee