gating.yaml

@@ -1,7 +1,7 @@
 # recipients: java-qa
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

java-21-openjdk.spec

@@ -373,7 +373,7 @@
 %if 0%{?centos} == 0
 %global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
 %else
-%global portablesuffix el9
+%global portablesuffix el8
 %endif
 %global portablebuilddir /builddir/build/BUILD
 
@@ -1138,10 +1138,6 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
 %if 0%{?rhel} >= 8 || 0%{?fedora} > 0
 Recommends: gtk3%{?_isa}
 %endif
-# Recommend PipeWire for screenshots under Wayland.
-%if 0%{?rhel} >= 9 || 0%{?fedora} > 0
-Recommends: pipewire%{?_isa}
-%endif
 
 Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 
@@ -1172,7 +1168,7 @@ Requires: lksctp-tools%{?_isa}
 # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
 # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
 # considered as regression
-Requires: copy-jdk-configs >= 4.0
+Requires: copy-jdk-configs >= 3.3
 OrderWithRequires: copy-jdk-configs
 %endif
 # for printing support
@@ -2368,10 +2364,9 @@ else
   return
   end
 end
-arg = nil ;  -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
+-- run content of included file with fake args
-cjc = require "copy_jdk_configs.lua"
+arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+require "copy_jdk_configs.lua"
-cjc.mainProgram(args)
 
 %post
 %{post_script %{nil}}
@@ -2573,17 +2568,13 @@ cjc.mainProgram(args)
 - Switch to GA mode
 - Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2025-07-15 @ 1pm PT. **
-- Resolves: RHEL-102289
+- Resolves: RHEL-102278
-
-* Thu Jul 10 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.7.0.6-3
-- Recommend PipeWire on RHEL 9 and later for java.awt.Robot screenshots under Wayland
-- Resolves: RHEL-102677
 
 * Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.8-0.1.ea
 - Update to jdk-21.0.8+8 (EA)
 - Update release notes to 21.0.8+8
 - Sync the copy of the portable specfile with the latest update
-- Resolves: RHEL-101798
+- Resolves: RHEL-101799
 
 * Wed Jul 09 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.2-0.1.ea
 - Update to jdk-21.0.8+2 (EA)
@@ -2592,8 +2583,8 @@ cjc.mainProgram(args)
 - Add timezone data update check to openjdk_news.sh
 - Add duplicate check to openjdk_news.sh
 - Exit if no fixes are obtained rather than try to run filters in openjdk_news.sh
-- Related: RHEL-101798
+- Related: RHEL-101799
-- Resolves: RHEL-103209
+- Resolves: RHEL-103210
 
 * Wed Jul 09 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.1-0.1.ea
 - Update get_bundle_versions.sh to match other scripts
@@ -2606,15 +2597,15 @@ cjc.mainProgram(args)
 - Add OpenJDK 8u support to get_bundle_versions.sh
 - Print bundle updates and backouts at end of openjdk_news.sh output
 - Refer user to get_bundle_versions.sh when bundle updates are found by openjdk_news.sh
-- Related: RHEL-103209
+- Related: RHEL-103210
 
 * Wed Jul 09 2025 Antonio Vieiro <avieirov@redhat.com> - 1:21.0.8.0.1-0.1.ea
 - Add script to obtain bundled library versions from OpenJDK sources
-- Related: RHEL-103209
+- Related: RHEL-103210
 
 * Wed Jul 09 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.8.0.1-0.1.ea
 - Warn about bundled provide version bumps and backouts in openjdk_news.sh
-- Related: RHEL-103209
+- Related: RHEL-103210
 
 * Wed Jul 09 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.1-0.1.ea
 - Update to jdk-21.0.8+1 (EA)
@@ -2626,12 +2617,12 @@ cjc.mainProgram(args)
 - Switch to EA mode
 - Drop JDK-8351500 local patch which is now available in 21.0.8+1 upstream
 - Sync the copy of the portable specfile with the latest update
-- Related: RHEL-101798
+- Related: RHEL-101799
 
 * Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
 - Add local version of JDK-8351500 for early interim release before 21.0.8
 - Sync the copy of the portable specfile with the latest update
-- Resolves: RHEL-90309
+- Resolves: RHEL-90306
 
 * Fri Apr 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-1
 - Update to jdk-21.0.7+6 (GA)
@@ -2640,12 +2631,8 @@ cjc.mainProgram(args)
 - Require tzdata 2025a due to upstream inclusion of JDK-8347965
 - Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2025-04-15 @ 1pm PT. **
-- Resolves: RHEL-86984
+- Resolves: RHEL-86981
-- Resolves: RHEL-86635
+- Resolves: RHEL-86632
-
-* Thu Feb 06 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-2
-- Bump tzdata requirement to 2024b for JDK-8339637
-- Resolves: RHEL-74001
 
 * Sat Jan 18 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1
 - Update to jdk-21.0.6+7 (GA)
@@ -2654,7 +2641,7 @@ cjc.mainProgram(args)
 - Include the latest devkit patches
 - Update README.md to list an easier way of disabling the devkit
 - ** This tarball is embargoed until 2025-01-21 @ 1pm PT. **
-- Resolves: RHEL-73562
+- Resolves: RHEL-73549
 
 * Fri Jan 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-3
 - Transition to the devkit build by not defining pkgos
@@ -2662,47 +2649,38 @@ cjc.mainProgram(args)
 - Sync the copy of the portable specfile with the devkit version
 - Include the devkit specfile and patches
 - Document the devkit in README.md
-- Resolves: RHEL-74403
+- Resolves: RHEL-74404
 
 * Wed Oct 16 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-2
 - Update to jdk-21.0.5+11 (GA)
 - Update release notes to 21.0.5+11
 - Remove local JDK-8327501 & JDK-8328366 backport as this is now upstream.
 - Sync the copy of the portable specfile with the latest update
-- Related: RHEL-61344
+- Related: RHEL-61346
 
 * Sun Oct 13 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-3
 - Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
-- Related: RHEL-61344
+- Related: RHEL-61346
 
 * Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-2
 - Update to jdk-21.0.5+10 (GA)
 - Update release notes to 21.0.5+10
-- Switch to GA mode.
-- Revert JDK-8327501 & JDK-8328366 backport until more mature.
-- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
-- Resolves: RHEL-61344
-
-* Fri Oct 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.9-0.2.ea
-- Update to jdk-21.0.5+9 (EA)
-- Update release notes to 21.0.5+9
-- Switch to EA mode
 - Bump giflib version to 5.2.2 following JDK-8328999
 - Bump libpng version to 1.6.43 following JDK-8329004
+- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
+- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
+- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
 - Sync with RHEL 7 portable build:
   - Use ExclusiveArch over ExcludeArch
   - pkgos definition needs to be early enough to be used in portablesuffix
 - Make build scripts executable
 - Sync the copy of the portable specfile with the latest update
-- Resolves: RHEL-58797
+- Revert JDK-8327501 & JDK-8328366 backport until more mature.
-- Resolves: RHEL-17191
+- Resolves: RHEL-58798
-
+- Resolves: RHEL-17186
-* Mon Oct 07 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-2
+- Resolves: RHEL-61346
-- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
+- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
-- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
-- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
-- Related: RHEL-58797
 
 * Fri Jul 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-1
 - Update to jdk-21.0.4+7 (GA)
@@ -2711,15 +2689,15 @@ cjc.mainProgram(args)
 - Sync the copy of the portable specfile with the latest update
 - Add missing section headers in NEWS
 - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
-- Resolves: RHEL-47023
+- Resolves: RHEL-47009
 
 * Wed Jun 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.5-0.1.ea
 - Update to jdk-21.0.4+5 (EA)
 - Update release notes to 21.0.4+5
 - Limit Java only tests to one architecture using jdk_test_arch
 - Actually require tzdata 2024a now it is available in the buildroot
-- Resolves: RHEL-45355
+- Resolves: RHEL-45358
-- Resolves: RHEL-47395
+- Resolves: RHEL-47398
 
 * Sat Jun 22 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.1-0.1.ea
 - Update to jdk-21.0.4+1 (EA)
@@ -2729,8 +2707,8 @@ cjc.mainProgram(args)
 - Add zlib build requirement or bundled version (1.3.1), depending on system_libs setting
 - Restore NEWS file so portable can be rebuilt
 - Sync the copy of the portable specfile with the latest update
-- Related: RHEL-45355
+- Related: RHEL-45358
-- Resolves: RHEL-46029
+- Resolves: RHEL-46027
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.9-1
 - Update to jdk-21.0.3+9 (GA)
@@ -2738,7 +2716,7 @@ cjc.mainProgram(args)
 - Switch to GA mode.
 - Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
-- Resolves: RHEL-32424
+- Resolves: RHEL-32406
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.7-0.1.ea
 - Update to jdk-21.0.3+7 (EA)
@@ -2747,7 +2725,7 @@ cjc.mainProgram(args)
 - Only require tzdata 2023d for now as 2024a is unavailable in buildroot
 - Drop JDK-8009550 which is now available upstream
 - Re-generate FIPS patch against 21.0.3+7 following backport of JDK-8325254
-- Resolves: RHEL-30946
+- Resolves: RHEL-30943
 
 * Sun Apr 14 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.3.0.1-0.2.ea
 - Invoke xz in multi-threaded mode
@@ -2778,7 +2756,7 @@ cjc.mainProgram(args)
 - generate_source_tarball.sh: Use long-style argument to grep
 - generate_source_tarball.sh: Add license
 - generate_source_tarball.sh: Add indentation instructions for Emacs
-- Related: RHEL-30946
+- Related: RHEL-30943
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea
 - Install alt-java man page from the misc tarball as it is no longer in the JDK image
@@ -2802,7 +2780,7 @@ cjc.mainProgram(args)
 - 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
-- Related: RHEL-30946
+- Related: RHEL-30943
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.1.ea
 - Update to jdk-21.0.3+1 (EA)
@@ -2810,11 +2788,12 @@ cjc.mainProgram(args)
 - Switch to EA mode
 - Require tzdata 2023d due to upstream inclusion of JDK-8322725
 - Bump FreeType version to 2.13.2 following JDK-8316028
-- Related: RHEL-30946
+- Related: RHEL-30943
 
 * Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
+- Sync the copy of the portable specfile with the latest update
 - Define portablesuffix according to whether pkgos is defined or not
-- Related: RHEL-30946
+- Related: RHEL-30943
 
 * Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1
 - Update to jdk-21.0.2+13 (GA)
@@ -2823,16 +2802,17 @@ cjc.mainProgram(args)
 - Bump HarfBuzz version to 8.2.2 following JDK-8313643
 - Drop local JDK-8311630 patch which is now upstream
 - ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
-- Resolves: RHEL-20999
+- Resolves: RHEL-20985
 
 * Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-3
 - Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
 - Sync the copy of the portable specfile with the latest update
-- Resolves: RHEL-16290
+- Resolves: RHEL-16289
 
 * Mon Oct 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
-- Define pkgnameroot to simplify build requirements and allow '-rhel7' suffix on RHEL
+- Switch to using portable binaries built on RHEL 7
-- Related: RHEL-12998
+- Sync the copy of the portable specfile with the RHEL 7 version
+- Related: RHEL-12996
 
 * Fri Oct 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-1
 - Update to jdk-21.0.1.0+12 (GA)
@@ -2854,21 +2834,21 @@ cjc.mainProgram(args)
 - Add missing jfr, jpackage and jwebserver alternative ghosts
 - Move jcmd to the headless package
 - Revert alt-java binary location to being within the JDK tree
-- Resolves: RHEL-12998
+- Resolves: RHEL-12996
-- Resolves: RHEL-14953
+- Resolves: RHEL-14951
-- Resolves: RHEL-13925
+- Resolves: RHEL-13924
-- Resolves: RHEL-14957
+- Resolves: RHEL-14955
-- Related: RHEL-14945
+- Related: RHEL-14943
-- Resolves: RHEL-11321
+- Resolves: RHEL-11322
-- Resolves: RHEL-14947
+- Resolves: RHEL-14949
 
 * Fri Oct 27 2023 Jiri Vanek <jvanek@redhat.com> - 1:21.0.1.0.12-1
 - Exclude classes_nocoops.jsa on i686 and arm32
-- Related: RHEL-14945
+- Related: RHEL-14943
 
 * Fri Oct 27 2023 Severin Gehwolf <sgehwolf@redhat.com> - 1:21.0.1.0.12-1
 - Fix packaging of CDS archives
-- Resolves: RHEL-14945
+- Resolves: RHEL-14943
 
 * Thu Aug 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-2
 - Update documentation (README.md)
@@ -2879,7 +2859,7 @@ cjc.mainProgram(args)
 - * No use of system libjpeg turbo to warrant RH649512 patch any more
 - Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
 - Adapt alt-java test to new binary where there is always a set_speculation function
-- Related: RHEL-12998
+- Related: RHEL-12996
 
 * Mon Aug 21 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-1
 - Update to jdk-21.0.0+35
@@ -2891,12 +2871,11 @@ cjc.mainProgram(args)
 - Re-enable tzdata tests now we are on the latest JDK and things are back in sync
 - Install jaxp.properties introduced by JDK-8303530
 - Install lible.so introduced by JDK-8306983
-- Related: RHEL-12998
+- Related: RHEL-12996
-- Resolves: RHEL-41087
 
 * Mon Aug 21 2023 Petra Alice Mikova <pmikova@redhat.com> - 1:21.0.0.0.35-1
 - Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798
-- Related: RHEL-12998
+- Related: RHEL-12996
 
 * Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.0.0.36-1
 - Update to jdk-20.0.2+9
@@ -2904,21 +2883,21 @@ cjc.mainProgram(args)
 - 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: RHEL-12998
+- Related: RHEL-12996
 
 * Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.0.0.36-1
 - Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream
 - Adapted rh1750419-redhat_alt_java.patch
-- Related: RHEL-12998
+- Related: RHEL-12996
 
-* 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-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: RHEL-12998
+- Related: RHEL-12996
 
 * Thu Aug 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-1
 - Update to jdk-18.0.2 release
@@ -2929,26 +2908,22 @@ cjc.mainProgram(args)
 - Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21
 - Disable tzdata tests until we are on the latest JDK and things are back in sync
 - Use empty nss.fips.cfg until it is again available via the FIPS patch
-- Related: RHEL-12998
+- Related: RHEL-12996
 
 * Thu Aug 10 2023 Petra Alice Mikova <pmikova@redhat.com> - 1:18.0.2.0.9-1
 - Update to ea version of jdk18
 - Add new slave jwebserver and corresponding manpage
 - Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-- Related: RHEL-12998
+- Related: RHEL-12996
 
 * Thu Aug 10 2023 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1:18.0.2.0.9-1
 - Add javaver- and origin-specific javadoc and javadoczip alternatives.
-- Related: RHEL-12998
+- Related: RHEL-12996
-
-* Tue Aug 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
-- Set portablerelease and portablerhel to use the CentOS 9 build
-- Related: RHEL-12998
 
 * Tue Aug 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
 - Add files missed by centpkg import.
-- Related: rhbz#2192748
+- Related: rhbz#2192749
 
 * Fri Aug 04 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-3
 - Create java-21-openjdk package based on java-17-openjdk
-- Related: rhbz#2192748
+- Related: rhbz#2192749