From 97eed775858825a4bb132e4d90d7e7cbf9f3bbcd Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 26 Oct 2025 16:56:31 +0000 Subject: [PATCH] Sync the copy of the portable specfile with the latest update Related: RHEL-120553 --- java-25-openjdk-portable.specfile | 53 +++++++++++++++++++------------ java-25-openjdk.spec | 1 + 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile index c6f5262..01d9ff8 100644 --- a/java-25-openjdk-portable.specfile +++ b/java-25-openjdk-portable.specfile @@ -327,7 +327,7 @@ %endif # New Version-String scheme-style defines -%global featurever 22 +%global featurever 23 %global fakefeaturever 25 %global interimver 0 %global updatever 2 @@ -335,7 +335,7 @@ # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, # and this it is better to change it here, on single place -%global buildjdkver %{featurever} +%global buildjdkver %(expr %{featurever} - 1) # 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. %if 0%{?rhel} && !0%{?epel} @@ -345,21 +345,6 @@ %global lts_designator "" %global lts_designator_zip "" %endif -# JDK to use for bootstrapping -%global bootjdkpkg java-%{fakefeaturever}-openjdk -%ifarch %{fastdebug_arches} -%global bootdebugpkg fastdebug -%endif -%global bootjdkzip %{_jvmdir}/%{bootjdkpkg}-*.portable%{?bootdebugpkg:.%{bootdebugpkg}}.jdk.%{_arch}.tar.xz -%global bootjdk %{_builddir}/%{bootjdkpkg}.boot -# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so -# This will only work where the bootstrap JDK is the same major version -# as the JDK being built -%if %{with fresh_libjvm} && %{buildjdkver} == %{featurever} -%global build_hotspot_first 1 -%else -%global build_hotspot_first 0 -%endif # Define vendor information used by OpenJDK %global oj_vendor Red Hat, Inc. @@ -400,8 +385,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 -%global rpmrelease 2 +%global buildver 7 +%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 @@ -468,6 +453,22 @@ %define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g") %define miscportablearchive() %{miscportablename}.tar.xz +# JDK to use for bootstrapping +%global bootjdkpkg java-%{fakefeaturever}-openjdk +%ifarch %{fastdebug_arches} +%global bootdebugpkg fastdebug +%endif +%global bootjdkzip %{_jvmdir}/%{bootjdkpkg}-*.portable%{?bootdebugpkg:.%{bootdebugpkg}}.jdk.%{_arch}.tar.xz +%global bootjdk %{_builddir}/%{uniquesuffix -- ""}/%{bootjdkpkg}.boot +# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so +# This will only work where the bootstrap JDK is the same major version +# as the JDK being built +%if %{with fresh_libjvm} && %{buildjdkver} == %{featurever} +%global build_hotspot_first 1 +%else +%global build_hotspot_first 0 +%endif + ################################################################# # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 # https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14 @@ -597,7 +598,7 @@ Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_ # 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 @@ -1066,7 +1067,7 @@ pushd %{_jvmdir} sha256sum --check %{bootjdkzip}.sha256sum popd tar -xJf %{bootjdkzip} -mv java-%{fakefeaturever}-openjdk-%{featurever}* %{bootjdk} +mv java-%{fakefeaturever}-openjdk-%{buildjdkver}* %{bootjdk} # Print release information echo "Installed boot JDK:" cat %{bootjdk}/release @@ -1957,6 +1958,16 @@ done %endif %changelog +* Sat Oct 25 2025 Andrew Hughes - 1:23.0.2.0.7-1 +- Update to jdk-23.0.2+7 (GA) +- Update release notes with features of JDK 23 +- Switch buildjdkver to featurever + 1 +- Use buildjdkver in the path to the extracted bootstrap JDK +- Move bootstrap declarations later so they can use variables like uniquesuffix +- Fix bootjdk so it uses our build subdirectory created in setup (_builddir only gives the top-level BUILD) +- Fix double '%' in specification of IcedTea sources +- Related: RHELBU-3203 + * Mon Sep 22 2025 Andrew Hughes - 1:22.0.2.0.9-2 - Build using ourselves rather than the system JDK as java-25-openjdk is unavailable on older systems - Switch buildjdkver back to featurever temporarily for this rebuild diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index 99b33d1..50297d2 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -2481,6 +2481,7 @@ exit 0 * Sat Oct 25 2025 Andrew Hughes - 1:23.0.2.0.7-1 - Update to jdk-23.0.2+7 (GA) - Update release notes with features of JDK 23 +- Sync the copy of the portable specfile with the latest update - Related: RHEL-120553 * Tue Sep 23 2025 Andrew Hughes - 1:22.0.2.0.9-1