From 28f88e2b3b2ae2f00c512b062001056f78a688da 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-58781 --- .gitignore | 1 + java-17-openjdk-portable.specfile | 174 +++++++++++++++++++++++++++++- java-17-openjdk.spec | 16 ++- sources | 2 +- 4 files changed, 185 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c95eff0..ea398f3 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 a3722b0..aaca250 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 11 +%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,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 9 -%global rpmrelease 4 +%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 %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 1 +%global is_ga 0 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -676,6 +676,8 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# +# Currently empty + ############################################# # # Portable build specific patches @@ -1780,6 +1782,170 @@ 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 + +* 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 + +* Mon Jul 8 2024 Andrew Hughes - 1:17.0.12.0.6-0.2.ea +- NEWS: Import 21 entries for JDK-8256660, JDK-8326891, JDK-8325496, + JDK-8281658, and JDK-8315503, use 21 formatting for JDK-8256660, + JDK-8316138 + +* Mon Jul 8 2024 Thomas Fitzsimmons - 1:17.0.12.0.6-0.2.ea +- Bump rpmrelease to 2 +- NEWS: Reword JDK-8256660 entry, add JDK-8316138 entry + +* Thu Jun 27 2024 Thomas Fitzsimmons - 1:17.0.12.0.6-0.1.ea +- Update to jdk-17.0.12+6 (EA) +- Update .gitignore to ignore openjdk-17.0.12+6-ea.tar.xz +- Update buildver to 6 +- Reset rpmrelease to 1 +- Update sources to openjdk-17.0.12+6-ea.tar.xz +- Update NEWS for 17.0.12+6 +- Remove --enable-compatible-cds-alignment configure option +- Resolves: OPENJDK-3134 + +* Wed Jun 26 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.3.ea +- Add upstream patch that removes illegal RLO Unicode characters +- Related: OPENJDK-2904 + +* Mon Jun 24 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.3.ea +- Add build requirement for zlib-devel +- Related: OPENJDK-3065 + +* Fri Jun 14 2024 Andrew Hughes - 1:17.0.12.0.5-0.3.ea +- Re-run jlink to regenerate the jmods directory and lib/modules with stripped libraries +- Resolves: OPENJDK-3055 + +* Fri Jun 14 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.3.ea +- Bump rpmrelease to 3 + +* Fri Jun 14 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.2.ea +- Delete fips-17u-d63771ea660.patch +- Use fips-17u-e893be00150.patch, rebased to jdk-17.0.12+2 +- fips-17u-e893be00150.patch was already committed with "Use 2.16.0...lcms2" +- Update fipsver to e893be00150 + +* Thu Jun 6 2024 Anton Bobrov - 1:17.0.12.0.5-0.2.ea +- generate_source_tarball.sh: Use tar exclude options for VCS files +- generate_source_tarball.sh: Improve VCS exclusion + +* Thu Jun 6 2024 Andrew Hughes - 1:17.0.12.0.5-0.2.ea +- generate_source_tarball.sh: Update examples in header for clarity +- generate_source_tarball.sh: Cleanup message issued when checkout already exists +- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP +- generate_source_tarball.sh: Only add --depth=1 on non-local repositories +- icedtea_sync.sh: Reinstate from rhel-8.9.0 branch +- Move maintenance scripts to a scripts subdirectory +- discover_trees.sh: Set compile-command and indentation instructions for Emacs +- discover_trees.sh: shellcheck: Do not use -o (SC2166) +- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- discover_trees.sh: shellcheck: Double-quote variable references (SC2086) +- generate_source_tarball.sh: Add authorship +- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs +- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086) +- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- openjdk_news.sh: Set compile-command and indentation instructions for Emacs +- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086) +- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268) +- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196) +- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST +- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086) +- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck + +* Mon Jun 3 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.2.ea +- Bump rpmrelease to 2 +- Sync generate_source_tarball.sh from Fedora rawhide + +* Wed May 29 2024 Thomas Fitzsimmons - 1:17.0.12.0.5-0.1.ea +- Update to jdk-17.0.12+5 (EA) +- Update .gitignore to ignore openjdk-17.0.12+5-ea.tar.xz +- Update buildver to 5 +- Update sources to openjdk-17.0.12+5-ea.tar.xz +- Update NEWS for 17.0.12+5 + +* Wed May 29 2024 Thomas Fitzsimmons - 1:17.0.12.0.4-0.1.ea +- Change a fix-me comment to a note instead + +* Thu May 23 2024 Thomas Fitzsimmons - 1:17.0.12.0.4-0.1.ea +- Update to jdk-17.0.12+4 (EA) +- Update .gitignore to ignore openjdk-17.0.12+4-ea.tar.xz +- Update buildver to 4 +- Update sources to openjdk-17.0.12+4-ea.tar.xz +- Update NEWS for 17.0.12+4 + +* Wed May 22 2024 Thomas Fitzsimmons - 1:17.0.12.0.3-0.1.ea +- Update to jdk-17.0.12+3 (EA) +- Update .gitignore to ignore openjdk-17.0.12+3-ea.tar.xz +- Update buildver to 3 +- Update sources to openjdk-17.0.12+3-ea.tar.xz +- Update NEWS for 17.0.12+3 + +* Wed May 15 2024 Thomas Fitzsimmons - 1:17.0.12.0.2-0.1.ea +- Use component in EPEL and Fedora bug URLs +- Label as error a designator mismatch + +* Mon May 13 2024 Thomas Fitzsimmons - 1:17.0.12.0.2-0.1.ea +- Use lcms2.h for bundled provides version reference +- Use 2.16.0, not 2.16, for lcms2 version +- Use zlib.h for bundled provides version reference +- Use freetype.h for bundled provides version reference +- Remove remove-test-left-to-right-override-character.patch + +* Fri May 10 2024 Thomas Fitzsimmons - 1:17.0.12.0.2-0.1.ea +- Update to jdk-17.0.12+2 (EA) +- Update .gitignore to ignore openjdk-17.0.12+2-ea.tar.xz +- Update buildver to 2 +- Update sources to openjdk-17.0.12+2-ea.tar.xz +- Update NEWS for 17.0.12+2 +- Add --enable-compatible-cds-alignment configure option (OPENJDK-3007) +- Add remove-test-left-to-right-override-character.patch +- Add remove-test-left-to-right-override-character.patch file +- Remove tzdata build requires (OPENJDK-2843) + +* Fri May 10 2024 Thomas Fitzsimmons - 1:17.0.12.0.1-0.1.ea +- Update lcms2 version location comment +- Update lcms2 bundled provides to 2.16 +- Add zlib 1.3.1 bundled provides + +* Thu May 9 2024 Thomas Fitzsimmons - 1:17.0.12.0.1-0.1.ea +- Update to jdk-17.0.12+1 (EA) +- Update .gitignore to ignore openjdk-17.0.12+1-ea.tar.xz +- Bump updatever to 12 +- Reset buildver to 1 +- Reset rpmrelease to 1 +- Reset is_ga to 0 +- Update sources to openjdk-17.0.12+1-ea.tar.xz +- 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-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 - Turn off 'fresh_libjvm' until jdk-17.0.9 or later is in the CentOS buildroot diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index e54e9ad..7ce5203 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -322,7 +322,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 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 3 # Settings used by the portable build @@ -402,7 +402,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 "" @@ -2491,6 +2491,16 @@ require "copy_jdk_configs.lua" %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-58781 + * Mon Sep 23 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-3 - Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 - 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