From 6786084c7ea913246ea0958f4c35847208b72cc7 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Tue, 26 Aug 2025 00:26:57 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update Related: RHEL-100678 --- java-25-openjdk-portable.specfile | 63 ++++++++++++++++++++----------- java-25-openjdk.spec | 1 + 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile index 1c11ea8..fd3249a 100644 --- a/java-25-openjdk-portable.specfile +++ b/java-25-openjdk-portable.specfile @@ -8,10 +8,10 @@ # Examples: # # Produce release, fastdebug *and* slowdebug builds on x86_64 (default): -# $ rpmbuild -ba java-21-openjdk.spec +# $ rpmbuild -ba java-25-openjdk.spec # # Produce only release builds (no debug builds) on x86_64: -# $ rpmbuild -ba java-21-openjdk.spec --without slowdebug --without fastdebug +# $ rpmbuild -ba java-25-openjdk.spec --without slowdebug --without fastdebug # # Only produce a release build on x86_64: # $ fedpkg mockbuild --without slowdebug --without fastdebug @@ -328,6 +328,7 @@ # New Version-String scheme-style defines %global featurever 21 +%global fakefeaturever 25 %global interimver 0 %global updatever 8 %global patchver 0 @@ -345,7 +346,7 @@ %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 @@ -382,7 +383,8 @@ %global fipsver 9203d50836c # Define JDK versions %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} -%global javaver %{featurever} +# Force 25 until we are actually ready to build that JDK version +%global javaver %{fakefeaturever} # Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames %global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) # The tag used to create the OpenJDK tarball @@ -429,16 +431,16 @@ %endif # parametrized macros are order-sensitive -%global compatiblename java-%{featurever}-%{origin} +%global compatiblename java-%{fakefeaturever}-%{origin} %global fullversion %{compatiblename}-%{version}-%{release} # images directories from upstream build %global jdkimage jdk %global static_libs_image static-libs # output dir stub -%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}} -%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} +%define buildoutputdir() %{expand:build/jdk%{fakefeaturever}.build%{?1}} +%define installoutputdir() %{expand:install/jdk%{fakefeaturever}.install%{?1}} %global altjavaoutputdir install/altjava.install -%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}} +%define packageoutputdir() %{expand:packages/jdk%{fakefeaturever}.packages%{?1}} # we can copy the javadoc to not arched dir, or make it not noarch %define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}} # main id and dir of this jdk @@ -544,7 +546,7 @@ %if 0%{?centos} == 0 ExclusiveArch: %{devkit_arches} %else -ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64 +ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64 %endif Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} @@ -731,7 +733,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 @@ -1062,7 +1064,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 @@ -1939,7 +1941,11 @@ done %endif %changelog -* Thu Jul 10 2025 Andrew Hughes - 1:21.0.8.0.9-1.1 +* Tue Aug 19 2025 Andrew Hughes - 1:21.0.8.0.9-1 +- Create java-25-openjdk-portable package based on java-21-openjdk-portable +- Related: RHELBU-3203 + +* Thu Jul 10 2025 Andrew Hughes - 1:21.0.8.0.9-1 - Update to jdk-21.0.8+9 (GA) - Update release notes to 21.0.8+9 - Switch to GA mode @@ -2077,7 +2083,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 @@ -2096,6 +2102,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 - 1:21.0.3.0.7-0.1.ea @@ -2190,6 +2197,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 - 1:21.0.1.0.12-2 - Use a devkit to build on architectures where we have one (s390x, aarch64, ppc64le, x86_64) @@ -2199,6 +2210,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 - 1:21.0.1.0.12-2 @@ -2220,7 +2232,7 @@ done * Fri Oct 27 2023 Andrew Hughes - 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 - 1:21.0.0.0.35-3 - Re-enable SystemTap support and perform only substitutions possible without final NVR available @@ -2232,6 +2244,7 @@ done * Thu Aug 24 2023 Andrew Hughes - 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 @@ -2255,27 +2268,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 - 1:20.0.0.0.36-1 +* Wed Aug 16 2023 Andrew Hughes - 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 - 1:20.0.0.0.36-1 +* Wed Aug 16 2023 Jiri Vanek - 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 - 1:19.0.1.0.10-1 +* Tue Aug 15 2023 Andrew Hughes - 1:19.0.2.0.7-2 +- Bump rpmrelease to rebuild for CentOS 9 + +* Tue Aug 15 2023 Andrew Hughes - 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 - 1:18.0.2.0.9-2 +- Bump rpmrelease to rebuild for CentOS 9 * Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release @@ -2285,14 +2302,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 - 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 - 1:17.0.7.0.7-3 +- Bump rpmrelease to rebuild for CentOS 9 * Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-2 - Create java-21-openjdk-portable package based on java-17-openjdk-portable diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index 6776db3..dd691d4 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -2476,6 +2476,7 @@ exit 0 * Mon Aug 25 2025 Andrew Hughes - 1:21.0.8.0.9-1 - Create java-25-openjdk package based on java-21-openjdk - Introduce fakefeaturever to pretend we are java-25-openjdk ahead of time +- Sync the copy of the portable specfile with the latest update - Related: RHEL-100678 * Thu Jul 10 2025 Andrew Hughes - 1:21.0.8.0.9-1