Sync the copy of the portable specfile with the latest update
Related: RHEL-169620 Related: RHEL-157091 Related: RHEL-161217 Related: RHEL-161333 Related: RHEL-169613
This commit is contained in:
Andrew Hughes
parent
4e62176a93
commit
f2aac50928
@ -336,7 +336,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 25
|
||||
%global interimver 0
|
||||
%global updatever 2
|
||||
%global updatever 3
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -376,7 +376,7 @@
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver e55ada9353e
|
||||
%global fipsver 57722aab802
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
@ -390,8 +390,8 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 10
|
||||
%global rpmrelease 3
|
||||
%global buildver 9
|
||||
%global rpmrelease 1
|
||||
#%%global tagsuffix %%{nil}
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
@ -661,18 +661,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
# OpenJDK patches which missed last update
|
||||
#
|
||||
#############################################
|
||||
# JDK-8372534: Update Libpng to 1.6.51
|
||||
# Integrated in 25.0.3
|
||||
Patch2001: jdk8372534-libpng-1.6.51.patch
|
||||
# JDK-8375063: Update Libpng to 1.6.54
|
||||
# Integrated in 25.0.3
|
||||
Patch2002: jdk8375063-libpng-1.6.54.patch
|
||||
# JDK-8375057: Update HarfBuzz to 12.3.2
|
||||
# Integrated in 25.0.3
|
||||
Patch2003: jdk8375057-harfbuzz-12.3.2.patch
|
||||
# JDK-8377526: Update Libpng to 1.6.55
|
||||
# Integrated in 25.0.3
|
||||
Patch2004: jdk8377526-libpng-1.6.55.patch
|
||||
|
||||
# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
|
||||
Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -755,9 +746,9 @@ BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.13.3
|
||||
Provides: bundled(freetype) = 2.14.2
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
Provides: bundled(giflib) = 6.1.2
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 12.3.2
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
@ -765,9 +756,9 @@ Provides: bundled(lcms2) = 2.17.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.55
|
||||
Provides: bundled(libpng) = 1.6.57
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
Provides: bundled(zlib) = 1.3.2
|
||||
# We link statically against libstdc++ to increase portability
|
||||
%ifnarch %{devkit_arches}
|
||||
BuildRequires: libstdc++-static
|
||||
@ -986,11 +977,8 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
pushd %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
# Add libpng & harfbuzz updates ahead of 25.0.3
|
||||
# Add EOPNOTSUPP patch
|
||||
%patch -P2001 -p1
|
||||
%patch -P2002 -p1
|
||||
%patch -P2003 -p1
|
||||
%patch -P2004 -p1
|
||||
popd # openjdk
|
||||
|
||||
echo "Generating %{alt_java_name} man page"
|
||||
@ -1958,6 +1946,23 @@ done
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
|
||||
- Update to jdk-25.0.3+9 (GA)
|
||||
- Update release notes to 25.0.3+9
|
||||
- Update FIPS patch to 57722aab802 version synced with 25.0.3+8
|
||||
- Drop local libpng patches now JDK-8372534, JDK-8375063 & JDK-8377526 are included upstream
|
||||
- Drop local HarfBuzz patch now JDK-8375057 is included upstream
|
||||
- Bump freetype version to 2.14.2 following JDK-8373290 & JDK-8379158
|
||||
- Bump giflib version to 6.1.2 following JDK-8379256 & JDK-8380078
|
||||
- Bump libpng version to 1.6.57 following JDK-8380959 & JDK-8382047
|
||||
- Bump zlib version to 1.3.2 following JDK-8378631
|
||||
- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
|
||||
- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
|
||||
- Resolves: OPENJDK-4634
|
||||
- Resolves: OPENJDK-4656
|
||||
- Resolves: OPENJDK-4607
|
||||
- Resolves: OPENJDK-4675
|
||||
|
||||
* Tue Mar 03 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-3
|
||||
- Update FIPS patch to e55ada9353e to include the fix for the too restrictive provider lockdown
|
||||
- Fix FIPS issue list to represent the new 25u version
|
||||
|
||||
@ -2614,6 +2614,7 @@ exit 0
|
||||
- Bump zlib version to 1.3.2 following JDK-8378631
|
||||
- Bump tzdata version to 2026a following JDK-8379035
|
||||
- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
|
||||
- Resolves: RHEL-169620
|
||||
- Resolves: RHEL-157091
|
||||
|
||||
Loading…
Reference in New Issue
Block a user