diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index 7e42a4cf091e2fdfaff42281b7f6abf0ab4e452d..e47120f1113b5fdd1740ef19907365dd4f27b7f5 100644 --- a/java-11-alibaba-dragonwell.spec +++ b/java-11-alibaba-dragonwell.spec @@ -33,7 +33,7 @@ %global name_pretty Alibaba Dragonwell %global drag_origin alibaba-dragonwell %global java_home /use/lib/jvm/%{name} -%global bootjdk /usr/lib/jvm/java-%{major_ver} +%global bootjdk /usr/lib/jvm/java %if %{with slowdebug} %global slowdebug_build -slowdebug @@ -746,7 +746,7 @@ function buildjdk() { pushd ${outputdir} bash ${top_dir_abs_src_path}/configure \ - --with-debug-level=${debuglevel} \ + --with-debug-level=${debuglevel} \ --with-native-debug-symbols="internal" \ --with-vendor-name="Alibaba" \ --with-vendor-url="http://www.alibabagroup.com" \ @@ -765,7 +765,7 @@ function buildjdk() { --with-libpng=${link_opt} \ --with-lcms=${link_opt} \ --with-harfbuzz=${link_opt} \ - --with-stdc++lib=dynamic \ + --with-stdc++lib=dynamic \ --with-boot-jdk=${buildjdk} \ --with-num-cores="$NUM_PROC" \ --disable-javac-server \ @@ -1038,8 +1038,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 || : @@ -1119,14 +1119,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} @@ -1242,8 +1242,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 || : @@ -1328,14 +1328,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} @@ -1430,8 +1430,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 || : @@ -1516,14 +1516,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}