From edf96100702efbf1f013fb2ff38ad355a26c7449 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 17 Sep 2024 16:17:51 -0400 Subject: [PATCH] Update to jdk-17.0.13+1 (EA) - Update to jdk-17.0.13+1 (EA) - Update .gitignore to ignore openjdk-17.0.13+1-ea.tar.xz - Synchronize java-17-openjdk-portable.specfile - Set updatever to 13 - Set buildver to 1 - Set is_ga to 0 - Update sources to openjdk-17.0.13+1-ea.tar.xz - Related: RHEL-58785 --- .gitignore | 1 + java-17-openjdk-portable.specfile | 22 +++++++++++++++------- java-17-openjdk.spec | 16 +++++++++++++--- sources | 2 +- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 37664d2..744eb31 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /openjdk-17.0.11+9.tar.xz /openjdk-17.0.12+6-ea.tar.xz /openjdk-17.0.12+7.tar.xz +/openjdk-17.0.13+1-ea.tar.xz diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index 31bf811..531fb7a 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -313,7 +313,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 12 +%global updatever 13 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -377,7 +377,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 1 %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 @@ -397,7 +397,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 build_type GA %global ea_designator "" @@ -676,9 +676,7 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# -# https://github.com/openjdk/jdk17u-dev/commit/859dda14f3f0d90294899812f5d34ea2e952a3df -# Remove after next upstream update. -Patch7: 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch +# Currently empty ############################################# # @@ -979,7 +977,6 @@ pushd %{top_level_dir_name} # rpmbuild. %patch -P1 -p1 %patch -P6 -p1 -%patch -P7 -p1 # Add crypto policy and FIPS support %patch -P1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security @@ -1819,6 +1816,17 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Fri Aug 2 2024 Thomas Fitzsimmons - 1:17.0.13.0.1-0.1.ea +- Update to jdk-17.0.13+1 (EA) +- Update .gitignore to ignore openjdk-17.0.13+1-ea.tar.xz +- Set updatever to 13 +- Set buildver to 1 +- Set is_ga to 0 +- Update sources to openjdk-17.0.13+1-ea.tar.xz +- Update NEWS for 17.0.13+1 (EA) +- Remove 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch +- Related: OPENJDK-2904 + * Fri Aug 02 2024 Andrew Hughes - 1:17.0.12.0.7-1 - Default to without fresh_libjvm now that java-17-openjdk-17.0.11.0.9-2.el9 is in c9s-pending - Related: CS-2390 diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 07f0ca9..3099387 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -326,7 +326,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 12 +%global updatever 13 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -381,7 +381,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 1 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM %global rpmrelease 3 # Settings used by the portable build @@ -406,7 +406,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 build_type GA %global ea_designator "" @@ -2496,6 +2496,16 @@ cjc.mainProgram(args) %endif %changelog +* Thu Oct 3 2024 Thomas Fitzsimmons - 1:17.0.13.0.1-0.2.ea +- Update to jdk-17.0.13+1 (EA) +- Update .gitignore to ignore openjdk-17.0.13+1-ea.tar.xz +- Synchronize java-17-openjdk-portable.specfile +- Set updatever to 13 +- Set buildver to 1 +- Set is_ga to 0 +- Update sources to openjdk-17.0.13+1-ea.tar.xz +- Related: RHEL-58785 + * Mon Sep 23 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-3 - Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 - Set rpmrelease to 3 diff --git a/sources b/sources index fa1094c..bd000ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-17.0.12+7.tar.xz) = 8cc9797b0b6ac2a64ce77eb354e9027b75b91ac1f116370d656444c89acc65108304bd5390cb369559fc8faead94d5549ddd1187960ded9419738e45ce7553c7 +SHA512 (openjdk-17.0.13+1-ea.tar.xz) = a73aef8ec8674b386bb7b82088058742bab934d7f9429b0100c1943da17fe708b5dbbe26744ee4362d3b2e7cfd6f6a56fcd97ab6a2c0582cd8c5c9a1037bc037