1 changed files with 36 additions and 70 deletions
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@ -349,7 +349,7 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        8
-%global rpmrelease      6
+%global rpmrelease      2
 # Settings used by the portable build
 %global portablerelease 2
 # Portable suffix differs between RHEL and CentOS
@ -2626,59 +2626,58 @@ exit 0
 %endif

 %changelog
-* Sat Dec 06 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-6
- Sync the copy of the portable specfile with the latest update
- Related: RHEL-133733
- Related: RHEL-133735
-
-* Thu Dec 04 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-6
- Remove /usr/lib/jvm/java-25-openjdk/conf/security/redhat/fips.properties
- Resolves: RHEL-131897
-
-* Thu Dec 04 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-5
+* Mon Dec 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
 - Incorporate new FIPS patch for 25u
 - Drop static libjvm.a following adjusted build target for portable build
 - Remove redundant (and now outdated) build targets, jdkimage and static_libs_image
- Pass ourflags and ourldflags into the nssadapter build using CFLAGS & LDFLAGS
- Patch the nssadapter build to recognise LDFLAGS
 - Remove OpenJDK compiler flag filters and use build_{c,ld}flags directly
- Resolves: RHEL-133733
- Resolves: RHEL-133735
- Resolves: RHEL-133763
+- Sync the copy of the portable specfile with the latest update
+- Resolves: RHEL-133743
+- Resolves: RHEL-133737
+- Related: RHEL-131898

-* Wed Nov 26 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-4
+* Mon Dec 08 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-2
 - Add java-25-openjdk-crypto-adapter subpackage
 - Update library setting in create-redhat-properties-files.bash
- Resolves: RHEL-131896
+- Remove /usr/lib/jvm/java-25-openjdk/conf/security/redhat/fips.properties
+- Resolves: RHEL-132520
+- Resolves: RHEL-132523

-* Mon Nov 24 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-3
+* Fri Nov 28 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
+- Pass ourflags and ourldflags into the nssadapter build using CFLAGS & LDFLAGS
+- Patch the nssadapter build to recognise LDFLAGS
+- Resolves: RHEL-131898
+
+* Mon Nov 24 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-1
 - Add libnssadapter.so
 - Add FIPS crypto-policies configuration
 - Remove obsolete security.useSystemPropertiesFile setup
 - Update TestSecurityProperties.java test and calling convention
- Resolves: RHEL-128413
- Resolves: RHEL-128409
+- Resolves: RHEL-128414
+- Resolves: RHEL-128412

-* Wed Nov 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
- Remove superfluous backslashes that cause two alternative commands to be combined
- Related: RHEL-120553
-
-* Mon Nov 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
+* Wed Nov 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
+- Create java-25-openjdk package based on java-21-openjdk
 - Update to jdk-25.0.1+8 (GA)
- Update release notes with features of JDK 25
+- Update release notes with features of JDK 22, 23, 24 & 25
 - Mention finalisation JEP for features finalised in JDK 22, 23 & 24
- Drop fakefeaturever now we have reached OpenJDK 25
 - Update release notes to 25.0.1+8
- Sync the copy of the portable specfile with the latest update
- Resolves: RHEL-120553
-
-* Wed Nov 05 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:24.0.2.0.12-1
- Update to jdk-24.0.2+12 (GA)
- Update release notes with features of JDK 24
+- Update README file for java-25-openjdk
+- Make sure this is not the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
+- Remove 21u FIPS patch and disable use until we are ready for the 25 version
+- Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values
+- Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?)
+- Remove references to libsystemconf.so and nss.fips.cfg from the 21u FIPS patch
+- Include static libraries in the vm_variant subdirectory after JDK-8307858 (libjvm.a)
+- Flip equals test in TestSecurityProperties.java to handle null values from Security.getProperty
+- Introduce crypto_policy_active to designate whether we should expect policy adherence in testing
+- Flip crypto_policy_active to false while the crypto policy & FIPS patch is not present
+- Handle new libsimdsort.so introduced on x86_64 only by JDK-8309130
+- Remove lible.so handling following its removal in JDK-8327476: "Upgrade JLine to 3.26.1"
+- Install jaxp-strict.properties.template added by JDK-8330542: "Template for Creating Strict JAXP Configuration File"
 - alt-java man page installation is now handled by the OpenJDK build
 - Adjust TestTranslations.java with updated German translations from CLDR 46 (JDK-8333582) (Mountain->Mountains)
 - Run javap with the disassembled code (-c) option now required for -l by JDK-8345145
- Sync the copy of the portable specfile with the latest update
 - Remove default.policy and java.policy following JDK-8338411: "Permanently Disable the Security Manager"
 - Make man page handling dependent on pandoc being available during the portable build
 - Handle new CDS archive variants (*_coh*) added by Compact Object Headers (JDK-8305895)
@ -2686,39 +2685,6 @@ exit 0
 - Support jnativescan added by JDK-8317611: "Add a tool like jdeprscan to find usage of restricted methods"
 - Add recent native libraries to _privatelibs (libjsvml.so, libsimdsort.so, libsyslookup.so)
 - Support libsleef on AArch64 & RISC-V added by JDK-8329816, JDK-8320500 (RISC-V) & JDK-8312425 (AArch64)
- Related: RHEL-120553
-
-* Sat Oct 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:23.0.2.0.7-1
- Update to jdk-23.0.2+7 (GA)
- Update release notes with features of JDK 23
+- Remove superfluous backslashes that cause two alternative commands to be combined
 - Sync the copy of the portable specfile with the latest update
- Remove lible.so handling following its removal in JDK-8327476: "Upgrade JLine to 3.26.1"
- Install jaxp-strict.properties.template added by JDK-8330542: "Template for Creating Strict JAXP Configuration File"
- Related: RHEL-120553
-
-* Tue Sep 23 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:22.0.2.0.9-1
- Update to jdk-22.0.2+9 (GA)
- Update release notes with features of JDK 22
- Remove 21u FIPS patch and disable use until we are ready for the 25 version
- Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values
- Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?)
- Sync the copy of the portable specfile with the latest update
- Remove references to libsystemconf.so and nss.fips.cfg from the 21u FIPS patch
- Include static libraries in the vm_variant subdirectory after JDK-8307858 (libjvm.a)
- Flip equals test in TestSecurityProperties.java to handle null values from Security.getProperty
- Introduce crypto_policy_active to designate whether we should expect policy adherence in testing
- Flip crypto_policy_active to false while the crypto policy & FIPS patch is not present
- Handle new libsimdsort.so introduced on x86_64 only by JDK-8309130
- Related: RHEL-100678
-
-* Mon Aug 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 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
- Update README file for java-25-openjdk
- Make sure this is not the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
- Related: RHEL-100678
-
-* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
- Update to jdk-21.0.8+9 (GA)
- Related: RHEL-100678
+- Resolves: RHEL-126022