Sync the copy of the portable specfile with the latest update
Related: RHEL-58786 Related: RHEL-17187
This commit is contained in:
parent
ed2bf7b0bc
commit
75176c54db
@ -273,7 +273,7 @@
|
|||||||
# Define version of OpenJDK 8 used
|
# Define version of OpenJDK 8 used
|
||||||
%global project openjdk
|
%global project openjdk
|
||||||
%global repo shenandoah-jdk8u
|
%global repo shenandoah-jdk8u
|
||||||
%global openjdk_revision 8u422-b05
|
%global openjdk_revision 8u432-b06
|
||||||
%global shenandoah_revision shenandoah%{openjdk_revision}
|
%global shenandoah_revision shenandoah%{openjdk_revision}
|
||||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||||
%global icedteaver 3.15.0
|
%global icedteaver 3.15.0
|
||||||
@ -551,8 +551,6 @@ Patch539: pr2888-rh2055274-support_system_cacerts-%{cacertsver}.patch
|
|||||||
Patch541: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
Patch541: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||||
# RH1750419: Enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
|
# RH1750419: Enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
|
||||||
Patch600: rh1750419-redhat_alt_java.patch
|
Patch600: rh1750419-redhat_alt_java.patch
|
||||||
# JDK-8281098, PR3836: Extra compiler flags not passed to adlc build
|
|
||||||
Patch112: jdk8281098-pr3836-pass_compiler_flags_to_adlc.patch
|
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
@ -599,6 +597,8 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
|
|||||||
Patch581: jdk8257794-remove_broken_assert.patch
|
Patch581: jdk8257794-remove_broken_assert.patch
|
||||||
# JDK-8186464, RH1433262: ZipFile cannot read some InfoZip ZIP64 zip files
|
# JDK-8186464, RH1433262: ZipFile cannot read some InfoZip ZIP64 zip files
|
||||||
Patch12: jdk8186464-rh1433262-zip64_failure.patch
|
Patch12: jdk8186464-rh1433262-zip64_failure.patch
|
||||||
|
# JDK-8328999, RH2251025 - Update GIFlib to 5.2.2 (PR#571)
|
||||||
|
Patch13: jdk8328999-update_giflib_5.2.2.patch
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
@ -647,6 +647,8 @@ BuildRequires: autoconf
|
|||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
BuildRequires: binutils
|
BuildRequires: binutils
|
||||||
|
# cacerts build requirement.
|
||||||
|
BuildRequires: ca-certificates
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
# elfutils only are OK for build without AOT
|
# elfutils only are OK for build without AOT
|
||||||
@ -654,8 +656,13 @@ BuildRequires: elfutils-devel
|
|||||||
BuildRequires: file
|
BuildRequires: file
|
||||||
BuildRequires: fontconfig-devel
|
BuildRequires: fontconfig-devel
|
||||||
BuildRequires: freetype-devel
|
BuildRequires: freetype-devel
|
||||||
|
# Earlier versions have a bug in tree vectorization on PPC
|
||||||
|
BuildRequires: gcc >= 4.8.3-8
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gdb
|
BuildRequires: gdb
|
||||||
|
BuildRequires: make
|
||||||
|
# Require a boot JDK which doesn't fail due to RH1482244
|
||||||
|
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
BuildRequires: libXext-devel
|
BuildRequires: libXext-devel
|
||||||
@ -666,25 +673,17 @@ BuildRequires: libXt-devel
|
|||||||
BuildRequires: libXtst-devel
|
BuildRequires: libXtst-devel
|
||||||
# Requirement for setting up nss.cfg and nss.fips.cfg
|
# Requirement for setting up nss.cfg and nss.fips.cfg
|
||||||
BuildRequires: nss-devel
|
BuildRequires: nss-devel
|
||||||
# Commented out for portable RHEL7 doesn't have this
|
|
||||||
# Requirement for system security property test
|
|
||||||
#BuildRequires: crypto-policies
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: tar
|
BuildRequires: tar
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: zip
|
BuildRequires: zip
|
||||||
# Require a boot JDK which doesn't fail due to RH1482244
|
|
||||||
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
|
|
||||||
# Zero-assembler build requirement
|
# Zero-assembler build requirement
|
||||||
%ifarch %{zero_arches}
|
%ifarch %{zero_arches}
|
||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
%endif
|
%endif
|
||||||
# Earlier versions have a bug in tree vectorization on PPC
|
|
||||||
BuildRequires: gcc >= 4.8.3-8
|
|
||||||
|
|
||||||
# cacerts build requirement.
|
|
||||||
BuildRequires: ca-certificates
|
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
BuildRequires: systemtap-sdt-devel
|
BuildRequires: systemtap-sdt-devel
|
||||||
%endif
|
%endif
|
||||||
@ -697,7 +696,7 @@ BuildRequires: libpng-devel
|
|||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%else
|
%else
|
||||||
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
||||||
Provides: bundled(giflib) = 5.2.1
|
Provides: bundled(giflib) = 5.2.2
|
||||||
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
||||||
Provides: bundled(lcms2) = 2.11.0
|
Provides: bundled(lcms2) = 2.11.0
|
||||||
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
||||||
@ -705,7 +704,7 @@ Provides: bundled(libjpeg) = 6b
|
|||||||
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
||||||
Provides: bundled(libpng) = 1.6.39
|
Provides: bundled(libpng) = 1.6.39
|
||||||
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
||||||
Provides: bundled(zlib) = 1.2.13
|
Provides: bundled(zlib) = 1.3.1
|
||||||
# We link statically against libstdc++ to increase portability
|
# We link statically against libstdc++ to increase portability
|
||||||
BuildRequires: libstdc++-static
|
BuildRequires: libstdc++-static
|
||||||
%endif
|
%endif
|
||||||
@ -864,7 +863,9 @@ sh %{SOURCE12}
|
|||||||
# AArch64 fixes
|
# AArch64 fixes
|
||||||
|
|
||||||
# x86 fixes
|
# x86 fixes
|
||||||
%patch -P105
|
pushd %{top_level_dir_name}
|
||||||
|
%patch -P105 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
# Upstreamable fixes
|
# Upstreamable fixes
|
||||||
%patch -P512
|
%patch -P512
|
||||||
@ -872,12 +873,12 @@ sh %{SOURCE12}
|
|||||||
%patch -P528
|
%patch -P528
|
||||||
%patch -P571
|
%patch -P571
|
||||||
%patch -P574
|
%patch -P574
|
||||||
%patch -P112
|
|
||||||
%patch -P581
|
%patch -P581
|
||||||
%patch -P541
|
%patch -P541
|
||||||
%patch -P12
|
%patch -P12
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
%patch -P502 -p1
|
%patch -P502 -p1
|
||||||
|
%patch -P13 -p1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
@ -1542,6 +1543,26 @@ done
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.432.b06-1
|
||||||
|
- Update to shenandoah-jdk8u432-b06 (GA)
|
||||||
|
- Update release notes for shenandoah-8u432-b06.
|
||||||
|
- Switch to GA mode.
|
||||||
|
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.432.b05-0.1.ea
|
||||||
|
- Update to shenandoah-jdk8u432-b05 (EA)
|
||||||
|
- Update release notes for shenandoah-8u432-b05.
|
||||||
|
- Switch to EA mode.
|
||||||
|
- Drop JDK-828109{6,7,8}/PR3836 patch following integration of upstream version
|
||||||
|
- Regenerate JDK-8199936/PR3533 patch following JDK-828109{6,7,8} integration
|
||||||
|
- Bump version of bundled zlib to 1.3.1 following JDK-8324632
|
||||||
|
- Add build dependency on make
|
||||||
|
- Reorganise build dependencies to retain alphabetical order for unconditional deps
|
||||||
|
- Include backport of JDK-8328999 to update giflib to 5.2.2
|
||||||
|
- Bump version of bundled giflib to 5.2.2 following JDK-8328999
|
||||||
|
- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
|
||||||
|
- Resolves: OPENJDK-3348
|
||||||
|
|
||||||
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-1.1
|
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-1.1
|
||||||
- Update to shenandoah-jdk8u422-b05 (GA)
|
- Update to shenandoah-jdk8u422-b05 (GA)
|
||||||
- Update release notes for shenandoah-8u422-b05.
|
- Update release notes for shenandoah-8u422-b05.
|
||||||
|
@ -2948,6 +2948,7 @@ cjc.mainProgram(args)
|
|||||||
- Include backport of JDK-8328999 to update giflib to 5.2.2
|
- Include backport of JDK-8328999 to update giflib to 5.2.2
|
||||||
- Bump version of bundled giflib to 5.2.2 following JDK-8328999
|
- Bump version of bundled giflib to 5.2.2 following JDK-8328999
|
||||||
- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
|
- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
|
||||||
|
- Sync the copy of the portable specfile with the latest update
|
||||||
- Resolves: RHEL-58786
|
- Resolves: RHEL-58786
|
||||||
- Resolves: RHEL-17187
|
- Resolves: RHEL-17187
|
||||||
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||||
|
Loading…
Reference in New Issue
Block a user