From 8ab53644f95a00c4d924c9e69b23005d77c789b7 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 17 Oct 2024 03:31:00 +0300 Subject: [PATCH] import java-17-openjdk-17.0.13.0.11-3.el9 --- .gitignore | 2 +- .java-17-openjdk.metadata | 2 +- ...-unpaired-RLO-Unicode-characters-in-.patch | 37 ------ SOURCES/java-17-openjdk-portable.specfile | 66 +++++++++-- SPECS/java-17-openjdk.spec | 111 ++++++++++++++---- 5 files changed, 150 insertions(+), 68 deletions(-) delete mode 100644 SOURCES/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch diff --git a/.gitignore b/.gitignore index 26fe97b..2adf074 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-17.0.12+7.tar.xz +SOURCES/openjdk-17.0.13+11.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/.java-17-openjdk.metadata b/.java-17-openjdk.metadata index e1a2838..266cb23 100644 --- a/.java-17-openjdk.metadata +++ b/.java-17-openjdk.metadata @@ -1,2 +1,2 @@ -c2066250e6821d30ff4bd1cecb6a0edb95aa73be SOURCES/openjdk-17.0.12+7.tar.xz +d8fdb1feceb3941a7f42642a070453290e336135 SOURCES/openjdk-17.0.13+11.tar.xz c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/SOURCES/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch b/SOURCES/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch deleted file mode 100644 index fcba27c..0000000 --- a/SOURCES/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 859dda14f3f0d90294899812f5d34ea2e952a3df Mon Sep 17 00:00:00 2001 -From: Thomas Fitzsimmons -Date: Wed, 26 Jun 2024 10:47:13 +0000 -Subject: [PATCH] 8332174: Remove 2 (unpaired) RLO Unicode characters in - ff_Adlm.xml - -Reviewed-by: andrew -Backport-of: d5363bc509d4996529420b453a99e982c843da1c ---- - make/data/cldr/common/main/ff_Adlm.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml -index 02feba420c8..05bb2c6db95 100644 ---- a/make/data/cldr/common/main/ff_Adlm.xml -+++ b/make/data/cldr/common/main/ff_Adlm.xml -@@ -272,7 +272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 𞤄𞤢𞤸𞤢𞤥𞤢𞥄𞤧 - 𞤄𞤵𞥅𞤼𞤢𞥄𞤲 - 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅 -- ‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢 -+ 𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢 - 𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧 - 𞤄𞤫𞤤𞤭𞥅𞥁 - 𞤑𞤢𞤲𞤢𞤣𞤢𞥄 -@@ -2245,7 +2245,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 𞤐𞤵𞥅𞤳 - - -- ‮𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼 -+ 𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼 - - - 𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲 --- -2.44.0 - diff --git a/SOURCES/java-17-openjdk-portable.specfile b/SOURCES/java-17-openjdk-portable.specfile index e1548f2..a66f72c 100644 --- a/SOURCES/java-17-openjdk-portable.specfile +++ b/SOURCES/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 11 %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 1 %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 ############################################# # @@ -727,8 +725,11 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel BuildRequires: libffi-devel %endif # Full documentation build requirements +# pandoc is only available on RHEL/CentOS 8 +%if 0%{?rhel} == 8 BuildRequires: graphviz BuildRequires: pandoc +%endif # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -976,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 @@ -1816,6 +1816,50 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Tue Oct 8 2024 Thomas Fitzsimmons - 1:17.0.13.0.11-1 +- Update NEWS for jdk-17.0.13+11 (GA) + +* Mon Oct 7 2024 Thomas Fitzsimmons - 1:17.0.13.0.11-1 +- Update to jdk-17.0.13+11 (GA) +- Add to .gitignore openjdk-17.0.13+11.tar.xz +- Set buildver to 11 +- Set is_ga to 1 +- Update sources to openjdk-17.0.13+11.tar.xz +- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. ** + +* Thu Oct 3 2024 Thomas Fitzsimmons - 1:17.0.13.0.10-0.1.ea +- Update to jdk-17.0.13+10 (EA) +- Add to .gitignore openjdk-17.0.13+10-ea.tar.xz +- Set buildver to 10 +- Update sources to openjdk-17.0.13+10-ea.tar.xz +- Update NEWS for jdk-17.0.13+10 + +* Wed Oct 2 2024 Thomas Fitzsimmons - 1:17.0.13.0.9-0.1.ea +- Update to jdk-17.0.13+9 (EA) +- Add to .gitignore openjdk-17.0.13+9-ea.tar.xz +- Set buildver to 9 +- Set rpmrelease to 1 +- Update sources to openjdk-17.0.13+9-ea.tar.xz +- Update NEWS for jdk-17.0.13+9 + +* Tue Sep 17 2024 Thomas Fitzsimmons - 1:17.0.13.0.1-0.2.ea +- Set rpmrelease to 2 + +* 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 @@ -1962,8 +2006,12 @@ 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-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 * Wed Apr 10 2024 Thomas Fitzsimmons - 1:17.0.11.0.9-3 - BuildRequires tzdata-java >= 2024a (JDK-8325150) @@ -2134,6 +2182,10 @@ done - Temporarily turn off 'fresh_libjvm' due to removal of JVM_IsThreadAlive (JDK-8305425) - ** This tarball is embargoed until 2023-10-17 @ 1pm PT. ** +* Sat Sep 02 2023 Andrew Hughes - 1:17.0.8.1.1-2 +- Bump rpmrelease to rebuild for CentOS 9 +- pandoc is only available on RHEL/CentOS 8 + * Sat Sep 02 2023 Andrew Hughes - 1:17.0.8.1.1-1 - Update to jdk-17.0.8.1+1 (GA) - Update release notes to 17.0.8.1+1 diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec index 0fbe9f9..6379bcf 100644 --- a/SPECS/java-17-openjdk.spec +++ b/SPECS/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,12 +381,12 @@ %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 11 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix el%{msvsphere} +%global portablesuffix el9 %global portablebuilddir /builddir/build/BUILD # 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 @@ -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 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -1412,10 +1412,6 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d # ############################################# -# 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 BuildRequires: autoconf @@ -1870,7 +1866,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 @@ -2496,6 +2491,73 @@ cjc.mainProgram(args) %endif %changelog +* Wed Oct 9 2024 Thomas Fitzsimmons - 1:17.0.13.0.11-3 +- Correct version suffix in "Update to jdk-17.0.13+11 (GA)" changelog entry +- Related: RHEL-58785 + +* Tue Oct 8 2024 Thomas Fitzsimmons - 1:17.0.13.0.11-2 +- Update to jdk-17.0.13+11 (GA) +- Update .gitignore to ignore openjdk-17.0.13+11.tar.xz +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 +- Set buildver to 11 +- Set is_ga to 1 +- Update sources to openjdk-17.0.13+11.tar.xz +- Resolves: RHEL-58785 +- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. ** + +* Fri Oct 4 2024 Andrew Hughes - 1:17.0.13.0.10-0.2.ea +- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') +- Set rpmrelease to 2 +- Related: RHEL-58785 + +* Fri Oct 4 2024 Thomas Fitzsimmons - 1:17.0.13.0.10-0.1.ea +- Update to jdk-17.0.13+10 (EA) +- Update .gitignore to ignore openjdk-17.0.13+10-ea.tar.xz +- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 +- Set buildver to 10 +- Update sources to openjdk-17.0.13+10-ea.tar.xz +- Related: RHEL-58785 + +* Thu Oct 3 2024 Thomas Fitzsimmons - 1:17.0.13.0.9-0.1.ea +- Update to jdk-17.0.13+9 (EA) +- Update .gitignore to ignore openjdk-17.0.13+9-ea.tar.xz +- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 +- Set buildver to 9 +- Set rpmrelease to 1 +- Set portablerelease to 1 +- Update sources to openjdk-17.0.13+9-ea.tar.xz +- Related: RHEL-58785 + +* Thu Oct 3 2024 Thomas Fitzsimmons - 1:17.0.13.0.1-0.4.ea +- Set rpmrelease to 4 +- Set portablerelease to 2 +- Related: RHEL-58785 + +* Thu Oct 3 2024 Thomas Fitzsimmons - 1:17.0.13.0.1-0.3.ea +- Synchronize java-17-openjdk-portable.specfile +- Set rpmrelease to 3 +- Related: RHEL-58785 + +* 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 +- Remove 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch +- Remove unicode section from rpminspect.yml, fixed instead by + https://gitlab.cee.redhat.com/osci/rpminspect-data-redhat/-/merge_requests/180 + (OPENJDK-2904) +- 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 +- Set portablesuffix to el9 + * Wed Jul 10 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 @@ -2504,8 +2566,8 @@ cjc.mainProgram(args) - Set portablerelease 1 - Set is_ga to 1 - Update sources to openjdk-17.0.12+7.tar.xz -- Resolves: RHEL-46641 -- Resolves: RHEL-47019 +- Resolves: RHEL-46635 +- Resolves: RHEL-47021 - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** * Tue Jul 9 2024 Thomas Fitzsimmons - 1:17.0.12.0.6-0.1.ea @@ -2574,7 +2636,8 @@ cjc.mainProgram(args) - Update tzdata BuildRequires comment to mention that 2024a is not yet in the buildroot - Update tzdata BuildRequires from 2023c to 2023d - Update sources from openjdk-17.0.11+7-ea.tar.xz to openjdk-17.0.11+9.tar.xz -- Resolves: RHEL-30939 +- Resolves: RHEL-30941 +- Resolves: RHEL-32421 - ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** * Thu Mar 28 2024 Thomas Fitzsimmons - 1:17.0.11.0.7-0.2.ea @@ -2587,7 +2650,7 @@ cjc.mainProgram(args) - openjdk_news.sh: Use grep -E instead of egrep - Remove RH1649512 patch for libjpeg-turbo FAR macro - Move pcsc-lite-libs patch to in-need-of-upstreaming section -- Related: RHEL-30939 +- Related: RHEL-30941 * Thu Jan 11 2024 Andrew Hughes - 1:17.0.10.0.7-1 - Update to jdk-17.0.10+7 (GA) @@ -2597,7 +2660,7 @@ cjc.mainProgram(args) - Re-enable DEFAULT_PROMOTED_VERSION_PRE check disabled for the July 2023 release - generate_source_tarball.sh: Add --sort=name to tar invocation for reproducibility - ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** -- Resolves: RHEL-20995 +- Resolves: RHEL-20997 * Thu Jan 11 2024 Thomas Fitzsimmons - 1:17.0.10.0.7-1 - Update to jdk-17.0.10+6 (EA) @@ -2622,7 +2685,7 @@ cjc.mainProgram(args) - generate_source_tarball.sh: shellcheck: Do not use $ in expression - generate_source_tarball.sh: Remove temporary directory exit conditions - generate_source_tarball.sh: Add note on network usage of OPENJDK_LATEST -- Related: RHEL-20995 +- Related: RHEL-20997 * Thu Oct 12 2023 Andrew Hughes - 1:17.0.9.0.9-1 - Update to jdk-17.0.9+9 (GA) @@ -2641,12 +2704,16 @@ cjc.mainProgram(args) - Add missing JFR and jpackage alternative ghosts - Move jcmd to the headless package - ** This tarball is embargoed until 2023-10-17 @ 1pm PT. ** -- Resolves: RHEL-12226 -- Resolves: RHEL-13662 -- Resolves: RHEL-13673 -- Resolves: RHEL-13683 -- Resolves: RHEL-13648 -- Resolves: RHEL-13651 +- Resolves: RHEL-12228 +- Resolves: RHEL-13660 +- Resolves: RHEL-13665 +- Resolves: RHEL-3494 +- Resolves: RHEL-11317 +- Resolves: RHEL-3461 + +* Mon Sep 04 2023 Andrew Hughes - 1:17.0.8.1.1-2 +- Set portablerelease and portablerhel to use the CentOS 9 build +- Resolves: RHEL-36137 * Mon Sep 04 2023 Andrew Hughes - 1:17.0.8.1.1-2 - Bump release number so we are newer than 9.0