Merge branch 'c8' into a8
This commit is contained in:
commit
5997da0d4c
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/openjdk-21.0.1+12.tar.xz
|
||||
SOURCES/openjdk-21.0.2+13.tar.xz
|
||||
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
062c60df2265006e2be6e2cec33b961d5183acd9 SOURCES/openjdk-21.0.1+12.tar.xz
|
||||
0768105cb0e64a986b767cde0dabad6cafc76c6b SOURCES/openjdk-21.0.2+13.tar.xz
|
||||
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
||||
@ -314,7 +314,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 21
|
||||
%global interimver 0
|
||||
%global updatever 1
|
||||
%global updatever 2
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -378,8 +378,8 @@
|
||||
%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 2
|
||||
%global buildver 13
|
||||
%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
|
||||
@ -662,9 +662,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
|
||||
@ -737,13 +734,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
|
||||
# We link statically against libstdc++ to increase portability
|
||||
BuildRequires: libstdc++-static
|
||||
%endif
|
||||
@ -946,8 +943,6 @@ pushd %{top_level_dir_name}
|
||||
%patch1001 -p1
|
||||
# Patches in need of upstreaming
|
||||
%patch6 -p1
|
||||
# Patches in next release
|
||||
%patch100 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -1691,6 +1686,26 @@ done
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%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)
|
||||
- Update release notes to 21.0.2+13
|
||||
- Drop no longer needed local patch to fix versioning
|
||||
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
||||
|
||||
* Mon Jan 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.12-1
|
||||
- Update to jdk-21.0.2+12 (GA)
|
||||
- Update release notes to 21.0.2+12
|
||||
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
||||
|
||||
* Sat Jan 06 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.11-1
|
||||
- Update to jdk-21.0.2+11 (GA)
|
||||
- Update release notes to 21.0.2+11
|
||||
- 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
|
||||
- Locally patch versioning to be 21.0.2 released on 2014-01-16
|
||||
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
||||
|
||||
* Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
|
||||
- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
@ -1412,9 +1412,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
|
||||
@ -1491,13 +1488,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
|
||||
@ -1862,8 +1859,6 @@ pushd %{top_level_dir_name}
|
||||
%patch1001 -p1
|
||||
# Patches in need of upstreaming
|
||||
%patch6 -p1
|
||||
# Patches in next release
|
||||
%patch100 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -2482,6 +2477,15 @@ 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
|
||||
|
||||
* 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user