From 8b00e74fd77241f0dd519fc403e8838ba78be47b Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 14 Jul 2023 15:48:12 +0100 Subject: [PATCH] Update to jdk-17.0.8+7 (GA) Update release notes to 17.0.8+7 Switch to GA mode for final release. Sync the copy of the portable specfile with the latest update Add note at top of spec file about rebuilding * This tarball is embargoed until 2023-07-18 @ 1pm PT. * Resolves: rhbz#2221106 --- .gitignore | 1 + java-17-openjdk-portable.specfile | 14 +++++++++++--- java-17-openjdk.spec | 22 +++++++++++++++++++--- sources | 2 +- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ed86ddd..0bf2f30 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /openjdk-jdk17u-jdk-17.0.7+7.tar.xz /openjdk-jdk17u-jdk-17.0.8+1.tar.xz /openjdk-jdk17u-jdk-17.0.8+6.tar.xz +/openjdk-jdk17u-jdk-17.0.8+7.tar.xz diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index c19ce36..5166f3b 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -373,7 +373,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 +%global buildver 7 %global rpmrelease 1 #%%global tagsuffix %%{nil} # 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 @@ -401,7 +401,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 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -968,7 +968,9 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then echo "WARNING: Designator mismatch"; echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'" echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'"; - exit 17 + # Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting + # This is fixed in the final upstream version + # exit 17 fi # Extract systemtap tapsets @@ -1690,6 +1692,12 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Fri Jul 14 2023 Andrew Hughes - 1:17.0.8.0.7-1 +- Update to jdk-17.0.8+7 (GA) +- Update release notes to 17.0.8+7 +- Switch to GA mode for final release. +- * This tarball is embargoed until 2023-07-18 @ 1pm PT. * + * Thu Jul 13 2023 Andrew Hughes - 1:17.0.8.0.6-0.1.ea - Update to jdk-17.0.8+6 (EA) - Update release notes to 17.0.8+6 diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index c198b54..4ae5576 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1,3 +1,8 @@ +# To rebuild this RPM, you must first rebuild the portable +# RPM using the java-17-openjdk-portable.specfile, install +# it and then adjust portablerelease and portablesuffix +# to match the new portable. + # RPM conditionals so as to be able to dynamically produce # slowdebug/release builds. See: # http://rpm.org/user_doc/conditional_builds.html @@ -364,7 +369,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 +%global buildver 7 %global rpmrelease 1 # Settings used by the portable build %global portablerelease 1 @@ -396,7 +401,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 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -1862,7 +1867,9 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then echo "WARNING: Designator mismatch"; echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'" echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'"; - exit 17 + # Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting + # This is fixed in the final upstream version + # exit 17 fi # Prepare desktop files @@ -2462,6 +2469,15 @@ cjc.mainProgram(args) %endif %changelog +* Fri Jul 14 2023 Andrew Hughes - 1:17.0.8.0.7-1 +- Update to jdk-17.0.8+7 (GA) +- Update release notes to 17.0.8+7 +- Switch to GA mode for final release. +- Sync the copy of the portable specfile with the latest update +- Add note at top of spec file about rebuilding +- * This tarball is embargoed until 2023-07-18 @ 1pm PT. * +- Resolves: rhbz#2221106 + * Thu Jul 13 2023 Andrew Hughes - 1:17.0.8.0.6-0.1.ea - Update to jdk-17.0.8+6 (EA) - Sync the copy of the portable specfile with the latest update diff --git a/sources b/sources index 5bd910f..e68552a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-jdk17u-jdk-17.0.8+6.tar.xz) = f417329f3c381d85c6fa9761ea68acd6a5ffc9187bb0e4ca561008327f776f5692bef7522f29034e2d943f7e03e14a92026e34cc4a823628db087fade3b82356 +SHA512 (openjdk-jdk17u-jdk-17.0.8+7.tar.xz) = 6bc6862ae1637b7da9bb5c729f91734d294ec3a137925ed5d39136b98a0aa5023f708bb3d6cd71bfaa5259b2a958987d7ae86ea95d2b0f3c45ffb36af8370ea3