diff --git a/download b/download index 56f97f32fdbe909dedd57f280f770be434ab75b2..e3e694b7deab12992940ceed5a4b597f0971e45d 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -492b86b3cb64b98765dbe313fe0ee9ca openjdk-jdk11u-jdk-11.0.22+7.tar.xz +b388826ca99176b3b4692de7226d78ca openjdk-jdk11u-jdk-11.0.23+9.tar.xz 5d441d6217cc75372ca5a0943997cb24 tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/java-11-openjdk-portable.specfile b/java-11-openjdk-portable.specfile index 987161316fd33a000decb43e22675c36c4505f82..fc196d35f7550fdbf21630115cd653723442facb 100644 --- a/java-11-openjdk-portable.specfile +++ b/java-11-openjdk-portable.specfile @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 22 +%global updatever 23 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -392,8 +392,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 -%global rpmrelease 1 +%global buildver 9 +%global rpmrelease 2 #%%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 @@ -571,7 +571,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). # Systemtap tapsets. Zipped up to keep it small. -Source8: tapsets-icedtea-%%{icedteaver}.tar.xz +Source8: tapsets-icedtea-%{icedteaver}.tar.xz # Desktop files. Adapted from IcedTea # Disabled in portables @@ -726,8 +726,9 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -747,17 +748,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 +Provides: bundled(freetype) = 2.13.2 # 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 @@ -1062,9 +1063,6 @@ function buildjdk() { bash ${top_dir_abs_src_path}/configure \ %ifarch %{zero_arches} --with-jvm-variants=zero \ -%endif -%ifarch %{ppc64le} - --with-jobs=1 \ %endif --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ --with-version-build=%{buildver} \ @@ -1648,6 +1646,23 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 +- Fix 11.0.22 release date in NEWS + +* Wed Apr 10 2024 Anton Bobrov - 1:11.0.23.0.9-1 +- Update to jdk-11.0.23+9 (GA) +- Update release notes to 11.0.23+9 +- Switch to GA mode for release +- Require tzdata 2024a due to upstream inclusion of JDK-8322725 +- Only require tzdata 2023d for now as 2024a is unavailable in buildroot +- Speed up PPC build by removing ppc64le --with-jobs=1 workaround +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** + +* Thu Mar 21 2024 Anton Bobrov - 1:11.0.23.0.1-0.1.ea +- Update to jdk-11.0.23+1 (EA) +- Update release notes to 11.0.23+1 +- Switch to EA mode + * Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 - Update to jdk-11.0.22+7 (GA) - Update release notes to 11.0.22+7 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index c0b20f8bb323e6996b019679a5b39e9f337ab33a..440835c1e342161caff1ceae9ec06b7ee4e29b7c 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -336,7 +336,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 22 +%global updatever 23 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -389,12 +389,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 9 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build -%global portablerelease_vendor 1 -%global portablerelease 1%{anolis_release} +%global portablerelease_vendor 2 +%global portablerelease 2%{anolis_release} %global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD @@ -1154,8 +1154,9 @@ Provides: jre%{?1} = %{epoch}:%{version}-%{release} Requires: ca-certificates # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem -# 2023c required as of JDK-8305113 -Requires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +Requires: tzdata-java >= 2023d # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1488,8 +1489,9 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1507,17 +1509,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 +Provides: bundled(freetype) = 2.13.2 # 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 @@ -2499,12 +2501,26 @@ end %endif %changelog -* Mon Jan 22 2024 Zhao Hang - 1:11.0.22.0.7-2.0.1 +* Thu Apr 25 2024 Zhao Hang - 1:11.0.23.0.9-2.0.1 - Update version for dependecy - Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) -* Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 -- Build for Rocky Linux %{rocky} using our own portable +* Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 +- Fix 11.0.22 release date in NEWS + +* Wed Apr 10 2024 Anton Bobrov - 1:11.0.23.0.9-1 +- Update to jdk-11.0.23+9 (GA) +- Update release notes to 11.0.23+9 +- Switch to GA mode for release +- Require tzdata 2024a due to upstream inclusion of JDK-8322725 +- Only require tzdata 2023d for now as 2024a is unavailable in buildroot +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** +- Resolves: RHEL-30917 + +* Thu Mar 28 2024 Anton Bobrov - 1:11.0.23.0.1-0.1.ea +- Update to jdk-11.0.23+1 (EA) +- Update release notes to 11.0.23+1 +- Switch to EA mode * Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 - Update to jdk-11.0.22+7 (GA)