Sync the copy of the portable specfile with the latest update

- Related: RHEL-188866

java-21-openjdk-portable.specfile

@@ -4,7 +4,7 @@
 %global updatever 12
 %global patchver 0
 %global buildver 8
-%global portablerelease 1
+%global portablerelease 2
 %global rpmrelease 0
 
 # Define IcedTea version used for SystemTap tapsets and desktop file
@@ -416,7 +416,7 @@ URL:      http://openjdk.java.net/
   %global lts_designator_zip ""
 %endif
 # JDK to use for bootstrapping
-%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
+%global bootjdk /usr/lib/jvm/java-%{featurever}-openjdk
 # Define whether to use the bootstrap JDK directly or with a fresh libjvm.so
 # This will only work where the bootstrap JDK is the same major version
 # as the JDK being built
@@ -529,7 +529,7 @@ URL:      http://openjdk.java.net/
 %if 0%{?centos} == 0
 ExclusiveArch: %{devkit_arches}
 %else
-ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64
+ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
 %endif
 
 # The source tarball, generated using generate_source_tarball.sh
@@ -683,7 +683,7 @@ BuildRequires: zip
 BuildRequires: tar
 BuildRequires: unzip
 BuildRequires: javapackages-filesystem
-BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel
+BuildRequires: java-%{featurever}-%{origin}%{?pkgos:-%{pkgos}}-devel
 # Zero-assembler build requirement
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
@@ -1006,7 +1006,7 @@ export NUM_PROC=${NUM_PROC:-1}
 %endif
 export XZ_OPT="-T0"
 
-%ifarch s390x sparc64 alpha %{power64} %{aarch64}
+%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
 export ARCH_DATA_MODEL=64
 %endif
 %ifarch alpha
@@ -1885,6 +1885,11 @@ done
 %endif
 
 %changelog
+* Wed Jul 29 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-2.0
+- Add CVEs to NEWS file
+- Update to tarball with final changeset ID
+- Related: OPENJDK-4865
+
 * Wed Jul 15 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-1.0
 - Update to jdk-21.0.12+8 (GA)
 - Update release notes to 21.0.12+8
@@ -2105,7 +2110,7 @@ done
 - Update release notes to 21.0.4+5
 - Move unstripped, misc and doc tarball handling into normal build / no suffix blocks
 - Limit Java only tests to one architecture using jdk_test_arch
-- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1
+- Drop unneeded tzdata-java build dependency following f854bb3955fb57bba4e83d09813e9cfd0e81079e
 - Resolves: OPENJDK-3133
 - Resolves: OPENJDK-3237
 - Resolves: OPENJDK-3182
@@ -2124,6 +2129,7 @@ done
 - Update to jdk-21.0.3+9 (GA)
 - Update release notes to 21.0.3+9
 - Switch to GA mode.
+- Update buildjdkver to match the featurever
 - ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
 
 * Thu Apr 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.7-0.1.ea
@@ -2218,6 +2224,10 @@ done
 - Update release notes to 21.0.2+13
 - Bump libpng version to 1.6.40 following JDK-8316030
 - Bump HarfBuzz version to 8.2.2 following JDK-8313643
+- pandoc is only available on RHEL/CentOS 8
+- Check for CentOS being defined to determine use of devkit
+- Set buildjdkver to 20 until OpenJDK 21 is available in the buildroot
+- Use featurever for JDK build dependencies
 
 * Mon Mar 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
 - Use a devkit to build on architectures where we have one (s390x, aarch64, ppc64le, x86_64)
@@ -2227,6 +2237,7 @@ done
 - Use system gdb for both builds as devkit version fails (needs devkit libraries, then JDK segfaults with them)
 - Filter out annobin plugin when using the devkit
 - Drop static libstdc++ build dependency on devkit builds as it should come from the devkit
+- Disable devkit build on CentOS where it is unavailable
 - Introduce tar_opts to avoid repetition of lengthy tar creation options
 
 * Thu Feb 08 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.1.0.12-2
@@ -2248,7 +2259,7 @@ done
 * Fri Oct 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-4
 - Rebuild jmods using the stripped binaries in release builds
 - Make sure the unstripped JDK is customised by the installjdk function
-- Resolves: OPENJDK-1974
+- Resolves: OPENJDK-3224
 
 * Thu Oct 26 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-3
 - Re-enable SystemTap support and perform only substitutions possible without final NVR available
@@ -2260,6 +2271,7 @@ done
 * Thu Aug 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-2
 - Update documentation (README.md, add missing JEP to release notes)
 - Replace alt-java patch with a binary separate from the JDK
+- Adapt alt-java test to new binary where there is always a set_speculation function
 - Drop stale patches that are of little use any more:
 - * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work
 - * No accessibility subpackage to warrant RH1648242 patch any more
@@ -2283,27 +2295,31 @@ done
 - Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798
 - Related: rhbz#2192749
 
-* Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.0.0.36-1
+* Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.2.0.9-1
 - Update to jdk-20.0.2+9
 - Update release notes to 20.0.2+9
 - Update system crypto policy & FIPS patch from new fips-20u tree
 - Update generate_tarball.sh ICEDTEA_VERSION
 - Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit)
-- Related: rhbz#2192749
 
-* Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.0.0.36-1
+* Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.2.0.9-1
 - Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream
 - Adapted rh1750419-redhat_alt_java.patch
-- Related: rhbz#2192749
 
-* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-1
+* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.2.0.7-2
+- Bump rpmrelease to rebuild for CentOS 9
+
+* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.2.0.7-1
 - Update to jdk-19.0.2 release
 - Update release notes to 19.0.2
 - Rebase FIPS patches from fips-19u branch
 - Remove references to sample directory removed by JDK-8284999
 - Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag
 - Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases
-- Related: rhbz#2192749
+- Switch buildjdkver to java-21-openjdk
+
+* Thu Aug 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-2
+- Bump rpmrelease to rebuild for CentOS 9
 
 * Thu Aug 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-1
 - Update to jdk-18.0.2 release
@@ -2313,14 +2329,14 @@ done
 - Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch
 - Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built
 - Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21
-- Switch bootjdkver to java-21-openjdk
 - Disable tzdata tests until we are on the latest JDK and things are back in sync
-- Related: rhbz#2192749
 
 * Thu Aug 10 2023 Petra Alice Mikova <pmikova@redhat.com> - 1:18.0.0.0.37-1
 - Update to ea version of jdk18
 - Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-- Related: rhbz#2192749
+
+* Mon May 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-3
+- Bump rpmrelease to rebuild for CentOS 9
 
 * Mon May 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-2
 - Create java-21-openjdk-portable package based on java-17-openjdk-portable

java-21-openjdk.spec

@@ -2570,6 +2570,7 @@ cjc.mainProgram(args)
 * Wed Jul 29 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-2.1
 - Add CVEs to NEWS file
 - Update to tarball with final changeset ID
+- Sync the copy of the portable specfile with the latest update
 - Related: RHEL-188866
 
 * Sat Jul 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-1.2