From eb7f0ea5e4ab1211191b3fa7c8a5202ba1915ca3 Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 21 Jan 2024 21:49:49 +0300 Subject: [PATCH] Update --- .gitignore | 2 +- .java-21-openjdk-portable.metadata | 2 ++ .java-21-openjdk.metadata | 2 -- SOURCES/README.md | 39 ----------------------------- SOURCES/jconsole.desktop.in | 10 -------- SPECS/java-21-openjdk-portable.spec | 39 ++++++++++++++++++++++++----- 6 files changed, 36 insertions(+), 58 deletions(-) create mode 100644 .java-21-openjdk-portable.metadata delete mode 100644 .java-21-openjdk.metadata delete mode 100644 SOURCES/README.md delete mode 100644 SOURCES/jconsole.desktop.in diff --git a/.gitignore b/.gitignore index ed3b4a4..c4a87d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-21.0.1+12.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz +SOURCES/openjdk-21.0.2+13.tar.xz diff --git a/.java-21-openjdk-portable.metadata b/.java-21-openjdk-portable.metadata new file mode 100644 index 0000000..59af62d --- /dev/null +++ b/.java-21-openjdk-portable.metadata @@ -0,0 +1,2 @@ +c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz +0768105cb0e64a986b767cde0dabad6cafc76c6b SOURCES/openjdk-21.0.2+13.tar.xz diff --git a/.java-21-openjdk.metadata b/.java-21-openjdk.metadata deleted file mode 100644 index a86ae45..0000000 --- a/.java-21-openjdk.metadata +++ /dev/null @@ -1,2 +0,0 @@ -062c60df2265006e2be6e2cec33b961d5183acd9 SOURCES/openjdk-21.0.1+12.tar.xz -c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/SOURCES/README.md b/SOURCES/README.md deleted file mode 100644 index cf5e219..0000000 --- a/SOURCES/README.md +++ /dev/null @@ -1,39 +0,0 @@ -OpenJDK 21 is the latest Long-Term Support (LTS) release of the Java platform. - -For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream -release page for OpenJDK 21 and the preceding interim releases: - -* 18: https://openjdk.java.net/projects/jdk/18/ -* 19: https://openjdk.java.net/projects/jdk/19/ -* 20: https://openjdk.java.net/projects/jdk/20/ -* 21: https://openjdk.java.net/projects/jdk/21/ - -# Rebuilding the OpenJDK package - -The OpenJDK packages are now created from a single build which is then -packaged for different major versions of Red Hat Enterprise Linux -(RHEL). This allows the OpenJDK team to focus their efforts on the -development and testing of this single build, rather than having -multiple builds which only differ by the platform they were built on. - -This does make rebuilding the package slightly more complicated than a -normal package. Modifications should be made to the -`java-21-openjdk-portable.specfile` file, which can be found with this -README file in the source RPM or installed in the documentation tree -by the `java-21-openjdk-headless` RPM. - -Once the modified `java-21-openjdk-portable` RPMs are built, they -should be installed and will produce a number of tarballs in the -`/usr/lib/jvm` directory. The `java-21-openjdk` RPMs can then be -built, which will use these tarballs to create the usual RPMs found in -RHEL. The `java-21-openjdk-portable` RPMs can be uninstalled once the -desired final RPMs are produced. - -Note that the `java-21-openjdk.spec` file has a hard requirement on -the exact version of java-21-openjdk-portable to use, so this will -need to be modified if the version or rpmrelease values are changed in -`java-21-openjdk-portable.specfile`. - -To reduce the number of RPMs involved, the `fastdebug` and `slowdebug` -builds may be disabled using `--without fastdebug` and `--without -slowdebug`. diff --git a/SOURCES/jconsole.desktop.in b/SOURCES/jconsole.desktop.in deleted file mode 100644 index 8a3b04d..0000000 --- a/SOURCES/jconsole.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@) -Comment=Monitor and manage OpenJDK applications -Exec=_SDKBINDIR_/jconsole -Icon=java-@JAVA_VER@-@JAVA_VENDOR@ -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Profiling;Java; -Version=1.0 diff --git a/SPECS/java-21-openjdk-portable.spec b/SPECS/java-21-openjdk-portable.spec index e48ec1d..78914b8 100644 --- a/SPECS/java-21-openjdk-portable.spec +++ b/SPECS/java-21-openjdk-portable.spec @@ -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,7 +378,7 @@ %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 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 @@ -662,8 +662,6 @@ Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch # ############################################# -# Currently empty - ############################################# # # Portable build specific patches @@ -734,13 +732,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 @@ -1686,6 +1684,35 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Sun Jan 21 2024 Arkady L. Shane - 1:21.0.2.0.13-1 +- Rebuilt for MSVSphere 9.3 + +* Wed Jan 17 2024 Release Engineering - 21.0.2.0.13-1 +- Build for Rocky Linux %{rocky} + +* Tue Jan 09 2024 Andrew Hughes - 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 - 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 - 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 - 1:21.0.1.0.12-2 +- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x + * Sun Oct 29 2023 Andrew Hughes - 1:21.0.1.0.12-1 - Update to jdk-21.0.1.0+12 (GA) - Update release notes to 21.0.1.0+12