diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index a832c31..64094d2 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1661,8 +1661,9 @@ BuildRequires: nss-devel BuildRequires: crypto-policies BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel -BuildRequires: zip +BuildRequires: tar BuildRequires: unzip +BuildRequires: zip # For definitions and macros like jvmdir BuildRequires: javapackages-filesystem %ifarch %{portable_build_arches} @@ -1700,17 +1701,18 @@ BuildRequires: giflib-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else -# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h -Provides: bundled(zlib) = 1.2.13 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.1 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h -Provides: bundled(lcms2) = 2.10.0 +Provides: bundled(lcms2) = 2.11.0 # Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in jdk/src/share/native/sun/awt/libpng/png.h Provides: bundled(libpng) = 1.6.39 +# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h +Provides: bundled(zlib) = 1.2.13 %ifnarch %{portable_build_arches} # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static @@ -2942,6 +2944,8 @@ cjc.mainProgram(args) - Switch to GA mode. - Sync the copy of the portable specfile with the latest update - Actually require tzdata 2024a now it is available in the buildroot +- Add missing build dependencies on zlib-devel and tar +- Update LCMS version to match JDK-8245400 - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** - Resolves: RHEL-46858 - Resolves: RHEL-47013