diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 4b84623..f177b48 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -2,9 +2,9 @@ %global featurever 21 %global interimver 0 %global updatever 12 -%global patchver 0 -%global buildver 8 -%global portablerelease 2 +%global patchver 1 +%global buildver 1 +%global portablerelease 1 %global rpmrelease 0 # Define IcedTea version used for SystemTap tapsets and desktop file @@ -25,8 +25,16 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup # Define an optional suffix for the OS this package is built on -%if 0%{?rhel} == 7 -%global pkgos rhel7 +# The portable package is intended to be built on either RHEL 8 +# or CentOS Stream 9; any other OS will automatically get an +# appropriate suffix +%global rhel_buildos 8 +%global centos_buildos 9 +%if 0%{?centos} == 0 && 0%{?rhel} != 0%{rhel_buildos} +%global pkgos rhel%{?rhel} +%endif +%if 0%{?centos} != 0 && 0%{?centos} != 0%{centos_buildos} +%global pkgos rhel%{?centos} %endif # Define milestone (EA for pre-releases, GA for releases) @@ -235,7 +243,7 @@ URL: http://openjdk.java.net/ # Set of architectures for which we have a devkit # Only used on RHEL %if 0%{?centos} == 0 -%global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64 +%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64 %endif # By default, we build a slowdebug build during main build on JIT architectures @@ -416,7 +424,7 @@ URL: http://openjdk.java.net/ %global lts_designator_zip "" %endif # JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{featurever}-openjdk +%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-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 @@ -526,10 +534,16 @@ URL: http://openjdk.java.net/ # Define the architectures on which we build # On RHEL, this should be the architectures with a devkit +# The exception is riscv64, which was introduced too recently +# for a devkit to exist. In that case, we build without devkit %if 0%{?centos} == 0 -ExclusiveArch: %{devkit_arches} +%if 0%{?rhel} >= 10 +ExclusiveArch: %{devkit_arches} riscv64 %else -ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64 +ExclusiveArch: %{devkit_arches} +%endif +%else +ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64 %endif # The source tarball, generated using generate_source_tarball.sh @@ -538,7 +552,7 @@ Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_ # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). # Systemtap tapsets. Zipped up to keep it small. -Source8: tapsets-icedtea-%%{icedteaver}.tar.xz +Source8: tapsets-icedtea-%{icedteaver}.tar.xz # Desktop files. Adapted from IcedTea # Disabled in portables @@ -683,7 +697,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip BuildRequires: javapackages-filesystem -BuildRequires: java-%{featurever}-%{origin}%{?pkgos:-%{pkgos}}-devel +BuildRequires: java-%{buildjdkver}-%{origin}-devel # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -873,6 +887,7 @@ The %{origin_nice} %{featurever} miscellany. echo "Preparing %{oj_vendor_version}" echo "System is RHEL=%{?rhel}%{!?rhel:0}, CentOS=%{?centos}%{!?centos:0}, EPEL=%{?epel}%{!?epel:0}, Fedora=%{?fedora}%{!?fedora:0}" +echo "Portable suffix is %{?pkgos}%{!?pkgos:unset}" # Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( %if 0%{?stapinstall:1} @@ -1006,7 +1021,7 @@ export NUM_PROC=${NUM_PROC:-1} %endif export XZ_OPT="-T0" -%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64 +%ifarch s390x sparc64 alpha %{power64} %{aarch64} export ARCH_DATA_MODEL=64 %endif %ifarch alpha @@ -1885,6 +1900,25 @@ done %endif %changelog +* Mon Aug 10 2026 Andrew Hughes - 1:21.0.12.1.1-1.0 +- Update to jdk-21.0.12.1+1 (GA) +- Update release notes to 21.0.12.1+1 +- Fix double '%' in specification of IcedTea sources +- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. ** +- Resolves: OPENJDK-5042 + +* Mon Aug 10 2026 Andrew Hughes - 1:21.0.12.0.8-3.0 +- Make rhel usage in pkgos optional as it may be undefined +- Simplify pkgos conditional to work on RHEL 8 +- Related: OPENJDK-5045 + +* Fri Aug 07 2026 Andrea Bolognani - 1:21.0.12.0.8-3.0 +- Automatically set pkgos when necessary +- Remove now redundant pkgos usage in JDK build dependency +- Don't attempt to use devkit on riscv64 +- Resolves: OPENJDK-5045 +- Resolves: OPENJDK-5046 + * Wed Jul 29 2026 Andrew Hughes - 1:21.0.12.0.8-2.0 - Add CVEs to NEWS file - Update to tarball with final changeset ID @@ -2110,7 +2144,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 f854bb3955fb57bba4e83d09813e9cfd0e81079e +- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1 - Resolves: OPENJDK-3133 - Resolves: OPENJDK-3237 - Resolves: OPENJDK-3182 @@ -2129,7 +2163,6 @@ 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 @@ -2224,10 +2257,6 @@ 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) @@ -2237,7 +2266,6 @@ 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 @@ -2259,7 +2287,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-3224 +- Resolves: OPENJDK-1974 * 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 @@ -2271,7 +2299,6 @@ 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 @@ -2295,31 +2322,27 @@ 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.2.0.9-1 +* Wed Aug 16 2023 Andrew Hughes - 1:20.0.0.0.36-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.2.0.9-1 +* Wed Aug 16 2023 Jiri Vanek - 1:20.0.0.0.36-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.2.0.7-2 -- Bump rpmrelease to rebuild for CentOS 9 - -* Tue Aug 15 2023 Andrew Hughes - 1:19.0.2.0.7-1 +* Tue Aug 15 2023 Andrew Hughes - 1:19.0.1.0.10-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 -- 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 +- Related: rhbz#2192749 * Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release @@ -2329,14 +2352,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 - -* Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-3 -- Bump rpmrelease to rebuild for CentOS 9 +- Related: rhbz#2192749 * 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-21-openjdk.spec b/java-21-openjdk.spec index 9987dac..05e5a78 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2473,6 +2473,7 @@ exit 0 * Mon Aug 10 2026 Andrew Hughes - 1:21.0.12.1.1-1.1 - Update to jdk-21.0.12.1+1 (GA) - Update release notes to 21.0.12.1+1 +- Sync the copy of the portable specfile with the latest update - ** This tarball is embargoed until 2026-08-18 @ 1pm PT. ** - Resolves: RHEL-235622