|
|
|
|
@ -27,7 +27,7 @@
|
|
|
|
|
# Enable static library builds by default.
|
|
|
|
|
%bcond_without staticlibs
|
|
|
|
|
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
|
|
|
|
|
%bcond_without fresh_libjvm
|
|
|
|
|
%bcond_with fresh_libjvm
|
|
|
|
|
# Build with system libraries
|
|
|
|
|
%bcond_with system_libs
|
|
|
|
|
|
|
|
|
|
@ -326,7 +326,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 17
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 8
|
|
|
|
|
%global updatever 9
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
|
@ -355,7 +355,7 @@
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
|
|
|
|
|
%else
|
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{name}
|
|
|
|
|
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
|
|
|
|
%else
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
|
|
|
|
|
%endif
|
|
|
|
|
@ -366,15 +366,23 @@
|
|
|
|
|
# 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 bf363eecce3
|
|
|
|
|
%global fipsver 51e1d00be4e
|
|
|
|
|
%global javaver %{featurever}
|
|
|
|
|
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
|
|
|
|
|
|
|
|
|
# Standard JPackage naming and versioning defines
|
|
|
|
|
%global origin openjdk
|
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
|
%global top_level_dir_name %{vcstag}
|
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
|
%global buildver 7
|
|
|
|
|
%global rpmrelease 2
|
|
|
|
|
%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
|
|
|
|
|
@ -388,14 +396,6 @@
|
|
|
|
|
# for techpreview, using 1, so slowdebugs can have 0
|
|
|
|
|
%global priority %( printf '%08d' 1 )
|
|
|
|
|
%endif
|
|
|
|
|
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
|
|
|
|
%global javaver %{featurever}
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
|
|
|
|
|
|
|
|
|
# Define milestone (EA for pre-releases, GA for releases)
|
|
|
|
|
# Release will be (where N is usually a number starting at 1):
|
|
|
|
|
@ -405,7 +405,7 @@
|
|
|
|
|
%if %{is_ga}
|
|
|
|
|
%global build_type GA
|
|
|
|
|
%global ea_designator ""
|
|
|
|
|
%global ea_designator_zip ""
|
|
|
|
|
%global ea_designator_zip %{nil}
|
|
|
|
|
%global extraver %{nil}
|
|
|
|
|
%global eaprefix %{nil}
|
|
|
|
|
%else
|
|
|
|
|
@ -560,7 +560,7 @@ URL: http://openjdk.java.net/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# The source tarball, generated using generate_source_tarball.sh
|
|
|
|
|
Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
|
|
|
|
|
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
|
|
|
|
|
|
|
|
|
|
# Use 'icedtea_sync.sh' to update the following
|
|
|
|
|
# They are based on code contained in the IcedTea project (6.x).
|
|
|
|
|
@ -659,9 +659,11 @@ Patch1001: fips-17u-%{fipsver}.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# OpenJDK patches appearing in 17.0.8
|
|
|
|
|
# OpenJDK patches appearing in 17.0.10
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
|
|
|
|
Patch2000: jdk8312489-max_sig_default_increase.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
@ -737,17 +739,17 @@ BuildRequires: libjpeg-devel
|
|
|
|
|
BuildRequires: libpng-devel
|
|
|
|
|
%else
|
|
|
|
|
# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
|
|
|
|
Provides: bundled(freetype) = 2.12.1
|
|
|
|
|
Provides: bundled(freetype) = 2.13.0
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.0.1
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.2.0
|
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
|
Provides: bundled(lcms2) = 2.15.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.37
|
|
|
|
|
Provides: bundled(libpng) = 1.6.39
|
|
|
|
|
# We link statically against libstdc++ to increase portability
|
|
|
|
|
BuildRequires: libstdc++-static
|
|
|
|
|
%endif
|
|
|
|
|
@ -947,9 +949,12 @@ pushd %{top_level_dir_name}
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
|
|
|
|
%patch1000 -p1
|
|
|
|
|
# JDK-8312489 backport, coming in 17.0.10
|
|
|
|
|
%patch2000 -p1
|
|
|
|
|
# alt-java support
|
|
|
|
|
%patch600 -p1
|
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
%patch600
|
|
|
|
|
|
|
|
|
|
# The OpenJDK version file includes the current
|
|
|
|
|
# upstream version information. For some reason,
|
|
|
|
|
@ -1692,6 +1697,29 @@ done
|
|
|
|
|
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Oct 12 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.9.0.9-1
|
|
|
|
|
- Update to jdk-17.0.9+9 (GA)
|
|
|
|
|
- Update release notes to 17.0.9+9
|
|
|
|
|
- Re-generate FIPS patch against 17.0.9+1 following backport of JDK-8209398
|
|
|
|
|
- Bump libpng version to 1.6.39 following JDK-8305815
|
|
|
|
|
- Bump HarfBuzz version to 7.2.0 following JDK-8307301
|
|
|
|
|
- Bump freetype version to 2.13.0 following JDK-8306881
|
|
|
|
|
- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal
|
|
|
|
|
- Sync generate_tarball.sh with 11u version
|
|
|
|
|
- Update bug URL for RHEL to point to the Red Hat customer portal
|
|
|
|
|
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
|
|
|
|
|
- Use upstream release URL for OpenJDK source
|
|
|
|
|
- Apply all patches using -p1
|
|
|
|
|
- Temporarily turn off 'fresh_libjvm' due to removal of JVM_IsThreadAlive (JDK-8305425)
|
|
|
|
|
- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Sat Sep 02 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.1.1-1
|
|
|
|
|
- Update to jdk-17.0.8.1+1 (GA)
|
|
|
|
|
- Update release notes to 17.0.8.1+1
|
|
|
|
|
- Add backport of JDK-8312489 already upstream in 17.0.10 (see OPENJDK-2095)
|
|
|
|
|
- Update openjdk_news script to specify subdirectory last
|
|
|
|
|
- Add missing discover_trees script required by openjdk_news
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.7-1
|
|
|
|
|
- Update to jdk-17.0.8+7 (GA)
|
|
|
|
|
- Update release notes to 17.0.8+7
|
|
|
|
|
|
