From e79cabf8e2c6f28d04b379b1ccb2924ab446f269 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Fri, 30 Jul 2021 06:23:55 +0100 Subject: [PATCH] Update to jdk-17+33, including JDWP fix and July 2021 CPU Resolves: rhbz#1972529 --- .gitignore | 1 + java-latest-openjdk.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 620751c..77dfe61 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /openjdk-jdk16-jdk-16+36.tar.xz /openjdk-jdk16u-jdk-16.0.1+9.tar.xz /openjdk-jdk17-jdk-17+26.tar.xz +/openjdk-jdk17-jdk-17+33.tar.xz diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index ad8b8ce..24c213e 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -297,8 +297,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 26 -%global rpmrelease 4 +%global buildver 33 +%global rpmrelease 0 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1072,7 +1072,7 @@ Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298 -Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}.1 +Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2225,6 +2225,10 @@ cjc.mainProgram(args) %endif %changelog +* Fri Jul 30 2021 Andrew Hughes - 1:17.0.0.0.33-0.0.ea.rolling +- Update to jdk-17+33, including JDWP fix and July 2021 CPU +- Resolves: rhbz#1972529 + * Thu Jul 22 2021 Fedora Release Engineering - 1:17.0.0.0.26-0.4.ea.rolling.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 4bb4cd6..312b5ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (openjdk-jdk17-jdk-17+26.tar.xz) = a400889ba4f141ecf29e46e42f2b2a07ba6df0760502467e7925a31e88ec6fa07deec99f919a42fd673b30df5c86f2adf5e0dcb00687404f0715527b79f2fec7 +SHA512 (openjdk-jdk17-jdk-17+33.tar.xz) = fa7e852a774d74dbd945a168f8e8f673601fbdf6ff3ce91a4c38a911b1ba66524fa30a8d4cdd60c7bb2c7f7d6d8ab353502c647a5e888a94c18958c7a8348b9c