|
|
|
|
@ -300,7 +300,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 21
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 1
|
|
|
|
|
%global updatever 2
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
|
|
|
|
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
|
|
|
|
@ -350,10 +350,10 @@
|
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
|
%global top_level_dir_name %{vcstag}
|
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
|
%global buildver 12
|
|
|
|
|
%global rpmrelease 3
|
|
|
|
|
%global buildver 13
|
|
|
|
|
%global rpmrelease 1
|
|
|
|
|
# Settings used by the portable build
|
|
|
|
|
%global portablerelease 2
|
|
|
|
|
%global portablerelease 1
|
|
|
|
|
%global portablesuffix el8
|
|
|
|
|
%global portablebuilddir /builddir/build/BUILD
|
|
|
|
|
|
|
|
|
|
@ -1263,7 +1263,6 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|
|
|
|
# Prevent brp-java-repack-jars from being run
|
|
|
|
|
%global __jar_repack 0
|
|
|
|
|
# Define the OS the portable JDK is built on
|
|
|
|
|
%global pkgos rhel7
|
|
|
|
|
%undefine pkgos
|
|
|
|
|
# Define the root name of the portable packages
|
|
|
|
|
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
|
|
|
|
@ -1415,9 +1414,6 @@ Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
|
|
|
|
|
# JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
|
|
|
|
|
Patch100: jdk8311630-s390_ffmapi.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# Portable build specific patches
|
|
|
|
|
@ -1494,13 +1490,13 @@ 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.2.0
|
|
|
|
|
Provides: bundled(harfbuzz) = 8.2.2
|
|
|
|
|
# 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.39
|
|
|
|
|
Provides: bundled(libpng) = 1.6.40
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# this is always built, also during debug-only build
|
|
|
|
|
@ -1865,8 +1861,6 @@ pushd %{top_level_dir_name}
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
# Patches in need of upstreaming
|
|
|
|
|
%patch6 -p1
|
|
|
|
|
# Patches in next release
|
|
|
|
|
%patch100 -p1
|
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2485,16 +2479,20 @@ require "copy_jdk_configs.lua"
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1
|
|
|
|
|
- Update to jdk-21.0.2+13 (GA)
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Bump libpng version to 1.6.40 following JDK-8316030
|
|
|
|
|
- Bump HarfBuzz version to 8.2.2 following JDK-8313643
|
|
|
|
|
- Drop local JDK-8311630 patch which is now upstream
|
|
|
|
|
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
|
|
|
|
- Resolves: RHEL-20984
|
|
|
|
|
|
|
|
|
|
* Tue Dec 26 2023 Alexey Lyubimov <a.lyubimov@msvsphere-os.ru> - 1:21.0.1.0.12-3.inferit
|
|
|
|
|
- Rebuilt for MSVSphere 8.9
|
|
|
|
|
|
|
|
|
|
* Mon Dec 25 2023 Alexey Lyubimov <a.lyubimov@msvsphere-os.ru> - 1:21.0.1.0.12-2.inferit
|
|
|
|
|
- Switch to using portable binaries built on MSVSphere 8.9
|
|
|
|
|
- Sync the copy of the portable specfile with the AlmaLinux 8
|
|
|
|
|
|
|
|
|
|
* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:21.0.1.0.12-2
|
|
|
|
|
- Rebuilt for MSVSphere 8.9
|
|
|
|
|
|
|
|
|
|
* Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-3
|
|
|
|
|
- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
|
MSVSphere Packaging Team
