diff --git a/dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz b/dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz similarity index 86% rename from dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz rename to dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz index 6cf184b3edaa43276a85266f399c062447e57db9..c066aa4702bf2d59fc7341ad5b8b3d5d57dac6f7 100644 Binary files a/dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz and b/dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz differ diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index 97acf93e62d04dc320c002f75108d46b72b2a47c..d2d118a5ce41e0ab3ff9316248851443f4abba45 100644 --- a/java-11-alibaba-dragonwell.spec +++ b/java-11-alibaba-dragonwell.spec @@ -17,17 +17,16 @@ %global major_ver 11 %global inter_ver 0 -%global update_ver 21 -%global patch_ver 18 -%global alibaba_ver 9 -%global build_ver 9 +%global update_ver 24 +%global alibaba_ver 21 +%global build_ver 8 %global dragonwell_ver %{major_ver}.%{inter_ver}.%{update_ver} -%global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{patch_ver} +%global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{alibaba_ver} %global distro_version %{dragonwell_ver}-%(printf "b%02d" %{anolis_release}) %global dragsourcename dragonwell-extended-%{newdragonwellver}_jdk-%{dragonwell_ver}-ga %global dragbuildname dragonwell%{major_ver}-dragonwell-extended-%{newdragonwellver}_jdk-%{dragonwell_ver}-ga -%global combiver $( expr 20 '*' %{alibaba_ver} + %{build_ver} ) -%global priority %( printf '%02d%02d%02d%02d%02d' %{major_ver} %{inter_ver} %{update_ver} %{patch_ver} %{combiver} ) +%global combiver $( expr 20 '*' %{build_ver} + %{build_ver} ) +%global priority %( printf '%02d%02d%02d%02d%02d' %{major_ver} %{inter_ver} %{update_ver} %{alibaba_ver} %{combiver} ) %global origin openjdk %global top_level_dir_name dragonwell @@ -687,7 +686,7 @@ function buildjdk() { --without-version-opt \ --with-version-build="%{build_ver}" \ --with-version-feature="%{major_ver}" \ - --with-version-patch="%{patch_ver}" \ + --with-version-patch="%{alibaba_ver}" \ --with-version-date="$(date +%Y-%m-%d)" \ --enable-unlimited-crypto \ --with-zlib=system \ @@ -822,7 +821,7 @@ for suffix in %{build_loop} ; do # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a ${top_dir_abs_main_build_path}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} - built_doc_archive=jdk-%{dragonwell_ver}.%{patch_ver}+%{build_ver}-docs.zip + built_doc_archive=jdk-%{dragonwell_ver}.%{alibaba_ver}+%{build_ver}-docs.zip cp -a ${top_dir_abs_main_build_path}/bundles/${built_doc_archive} \ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}/bundles/ fi @@ -2031,6 +2030,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %endif %changelog +* Thu Aug 22 2024 lvfei.lv - 3:11.0.24.21+8-1 +- update source code to 11.0.24.21+8 and remove patch_ver + * Mon Jan 29 2024 lvfei.lv - 3:11.0.21.18+9-1 - update package to 11.0.21.18+9 @@ -2062,6 +2064,3 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ * Thu May 26 2022 happy_orange - 1:11.0.15.11.9-1 - Init package from dragonwell - - -