diff --git a/.gitignore b/.gitignore index 06fbbcf..6b6ea70 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.5+9.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.5+10.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.5+10-4curve.tar.xz +/shenandoah-jdk11-shenandoah-jdk-11.0.6+1-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 5dcf4e7..57dcef5 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -200,7 +200,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 5 +%global securityver 6 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -222,7 +222,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 10 +%global buildver 1 %global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -240,7 +240,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global ea_designator "" %global ea_designator_zip "" @@ -431,6 +431,7 @@ alternatives \\ --slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\ --slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\ --slave %{_bindir}/jdeprscan jdeprscan %{sdkbindir -- %{?1}}/jdeprscan \\ + --slave %{_bindir}/jfr jfr %{sdkbindir -- %{?1}}/jfr \\ --slave %{_bindir}/jimage jimage %{sdkbindir -- %{?1}}/jimage \\ --slave %{_bindir}/jinfo jinfo %{sdkbindir -- %{?1}}/jinfo \\ --slave %{_bindir}/jmap jmap %{sdkbindir -- %{?1}}/jmap \\ @@ -699,6 +700,7 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan +%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jfr %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage # Zero and S390x don't have SA %ifarch %{jit_arches} @@ -1828,6 +1830,11 @@ require "copy_jdk_configs.lua" %changelog +* Thu Dec 19 2019 Andrew Hughes - 1:11.0.6.1-0.0.ea +- Update to shenandoah-jdk-11.0.6+1 (EA) +- Switch to EA mode for 11.0.6 pre-release builds. +- Add support for jfr binary. + * Wed Oct 09 2019 Andrew Hughes - 1:11.0.5.10-0 - Update to shenandoah-jdk-11.0.5+10 (GA) - Switch to GA mode for final release. diff --git a/sources b/sources index 06f1ffa..348bb8d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d -SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.5+10-4curve.tar.xz) = 9b1ec5045b16806bcca8843a50524c22325e0c72df5878db3655ed3d35d8195e211315c4998a8321e3ddddd2272caf895e901dd173ce86756be21260765de7e1 +SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.6+1-4curve.tar.xz) = 1e7353663dcc9f32fb364453efab3d5afddd216dd655e38e6a17aad1befe3f2a7a8a041f40714f15bfe1ed041b9d339a3fc7bd128e3106aece7cd78159851d92