From b9815795042172220bfb3a05968a4eea5c971cbc Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 13 Aug 2020 20:04:28 +0000 Subject: [PATCH] Update to jdk-11.0.9+2 (EA) With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly --- .gitignore | 1 + java-11-openjdk.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 112fc16..3add2bb 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.8+9-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 6a2fb6d..ef7fb13 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,8 +258,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 1 -%global rpmrelease 2 +%global buildver 2 +%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 %if %is_system_jdk @@ -1053,7 +1053,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz +Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (3.x). @@ -1962,6 +1962,10 @@ require "copy_jdk_configs.lua" %changelog +* Tue Aug 11 2020 Andrew Hughes - 1:11.0.9.2-0.0.ea +- Update to jdk-11.0.9+2 (EA) +- With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly + * Tue Aug 11 2020 Andrew Hughes - 1:11.0.9.1-0.2.ea - Cleanup architecture and JVM feature handling in preparation for using upstreamed Shenandoah. diff --git a/sources b/sources index 441b5b9..2dcd95c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz) = 85a9b5d2a26b1a70bab7a58950238d8b24c050a26ffc6a7b14143cd656840e4aba5a609501a214d4aa5660e8a398dd7886c41a4bce561555b1611e5f547a6dc8 +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz) = 5a9fb6c67c517a6afff840d7a334ce83bdd2bf36c9d3341ea44f0e902d07f134737d3f9dbf3c56e6d4d7258de5814aae7f9dde573698916924476ce215c4b0b9