diff --git a/.gitignore b/.gitignore index cdf8a88..37664d2 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /openjdk-17.0.11+7-ea.tar.xz /openjdk-17.0.11+9.tar.xz /openjdk-17.0.12+6-ea.tar.xz +/openjdk-17.0.12+7.tar.xz diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index d4a1a12..31bf811 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -24,7 +24,7 @@ # Enable static library builds by default. %bcond_without staticlibs # Build a fresh libjvm.so for use in a copy of the bootstrap JDK -%bcond_with fresh_libjvm +%bcond_without fresh_libjvm # Build with system libraries %bcond_with system_libs @@ -377,8 +377,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 -%global rpmrelease 2 +%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 %if %is_system_jdk @@ -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 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -1819,8 +1819,19 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog -* Mon Jul 29 2024 Andrew Hughes - 1:17.0.11.0.9-5 -- Bump rpmrelease to rebuild for CentOS 9 +* 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 + +* Wed Jul 10 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-1 +- Update to jdk-17.0.12+7 (GA) +- Update .gitignore to ignore openjdk-17.0.12+7.tar.xz +- Update NEWS for 17.0.12+7 (GA) +- Set buildver to 7 +- Set rpmrelease to 1 +- Set is_ga to 1 +- Update sources to openjdk-17.0.12+7.tar.xz +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** * Mon Jul 08 2024 Andrew Hughes - 1:17.0.12.0.6-0.2.ea - Adjusted DTLS NEWS entry style to match other entries @@ -1958,8 +1969,8 @@ done - Update NEWS for 17.0.12+1 - Fix fips-17u-d63771ea660.patch so that it applies to 17.0.12+1 -* Thu Apr 18 2024 Andrew Hughes - 1:17.0.11.0.9-4 -- Sync release notes with upstream version: https://bit.ly/openjdk17011 +* Thu Apr 18 2024 Andrew Hughes - 1:17.0.11.0.9-5 +- Bump rpmrelease to rebuild for CentOS 9 * Thu Apr 18 2024 Andrew Hughes - 1:17.0.11.0.9-4 - Sync release notes with upstream version: https://bit.ly/openjdk17011 diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 8159950..708b2b9 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -387,11 +387,11 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 +%global buildver 7 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM %global rpmrelease 2 # Settings used by the portable build -%global portablerelease 5 +%global portablerelease 1 %global portablesuffix el9 %global portablebuilddir /builddir/build/BUILD @@ -412,7 +412,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 "" @@ -2506,6 +2506,17 @@ cjc.mainProgram(args) %endif %changelog +* Sun Aug 04 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-2 +- Update to jdk-17.0.12+7 (GA) +- Update .gitignore to ignore openjdk-17.0.12+7.tar.xz +- Sync java-17-openjdk-portable.specfile +- Set buildver to 7 +- Set portablerelease 1 +- Set is_ga to 1 +- Update sources to openjdk-17.0.12+7.tar.xz +- Resolves: RHEL-52734 +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** + * Sun Aug 04 2024 Anton Bobrov - 1:17.0.12.0.6-0.1.ea - generate_source_tarball.sh: Use tar exclude options for VCS files - generate_source_tarball.sh: Improve VCS exclusion diff --git a/sources b/sources index b5b095f..fa1094c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-17.0.12+6-ea.tar.xz) = c18f8bafa4e5dac7d10ac3ca5def09bd68802756f83a8615e58f47eebd291a53b24a9900afd7dde38310f4d6030f27b9036c9f2656b93cb336dd5885072affc0 +SHA512 (openjdk-17.0.12+7.tar.xz) = 8cc9797b0b6ac2a64ce77eb354e9027b75b91ac1f116370d656444c89acc65108304bd5390cb369559fc8faead94d5549ddd1187960ded9419738e45ce7553c7