rpms/java-1.8.0-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add missing build dependencies on zlib-devel & tar and match LCMS version to JDK-8245400

Browse Source 
Related: RHEL-46858
This commit is contained in:
Andrew Hughes 2024-07-11 01:35:07 +01:00
parent 9a1cab761c
commit 7b284ff99c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java-1.8.0-openjdk.spec
View File

@ -1661,8 +1661,9 @@ BuildRequires: nss-devel
BuildRequires: crypto-policies BuildRequires: crypto-policies
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: zip BuildRequires: tar
BuildRequires: unzip BuildRequires: unzip
BuildRequires: zip
# For definitions and macros like jvmdir # For definitions and macros like jvmdir
BuildRequires: javapackages-filesystem BuildRequires: javapackages-filesystem
%ifarch %{portable_build_arches} %ifarch %{portable_build_arches}
@ -1700,17 +1701,18 @@ BuildRequires: giflib-devel
BuildRequires: lcms2-devel BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: zlib-devel
%else %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 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1 Provides: bundled(giflib) = 5.2.1
# 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.10.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
Provides: bundled(libjpeg) = 6b 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
Provides: bundled(zlib) = 1.2.13
%ifnarch %{portable_build_arches} %ifnarch %{portable_build_arches}
# We link statically against libstdc++ to increase portability # We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static BuildRequires: libstdc++-static
@ -2942,6 +2944,8 @@ cjc.mainProgram(args)
- Switch to GA mode. - Switch to GA mode.
- Sync the copy of the portable specfile with the latest update - Sync the copy of the portable specfile with the latest update
- Actually require tzdata 2024a now it is available in the buildroot - 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. ** - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
- Resolves: RHEL-46858 - Resolves: RHEL-46858
- Resolves: RHEL-47013 - Resolves: RHEL-47013