From 80cc65126a46f001ec629b3492af1070112e6446 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 10 Nov 2025 14:30:31 +0000 Subject: [PATCH] Sync the copy of the portable specfile with the latest update Related: RHEL-120553 --- java-25-openjdk-portable.specfile | 41 ++++++++++++++++++++----------- java-25-openjdk.spec | 1 + 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile index 3a562c3..0b18950 100644 --- a/java-25-openjdk-portable.specfile +++ b/java-25-openjdk-portable.specfile @@ -334,15 +334,14 @@ %endif # New Version-String scheme-style defines -%global featurever 24 -%global fakefeaturever 25 +%global featurever 25 %global interimver 0 -%global updatever 2 +%global updatever 1 %global patchver 0 # 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 %(expr %{featurever} - 1) +%global buildjdkver %{featurever} # 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} @@ -380,8 +379,7 @@ %global fipsver 9203d50836c # Define JDK versions %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} -# Force 25 until we are actually ready to build that JDK version -%global javaver %{fakefeaturever} +%global javaver %{featurever} # Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames %global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) # The tag used to create the OpenJDK tarball @@ -392,7 +390,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 8 %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 @@ -428,16 +426,16 @@ %endif # parametrized macros are order-sensitive -%global compatiblename java-%{fakefeaturever}-%{origin} +%global compatiblename java-%{featurever}-%{origin} %global fullversion %{compatiblename}-%{version}-%{release} # images directories from upstream build %global jdkimage jdk %global static_libs_image static-libs # output dir stub -%define buildoutputdir() %{expand:build/jdk%{fakefeaturever}.build%{?1}} -%define installoutputdir() %{expand:install/jdk%{fakefeaturever}.install%{?1}} +%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}} +%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} %global altjavaoutputdir install/altjava.install -%define packageoutputdir() %{expand:packages/jdk%{fakefeaturever}.packages%{?1}} +%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}} # we can copy the javadoc to not arched dir, or make it not noarch %define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}} # main id and dir of this jdk @@ -461,7 +459,7 @@ %define miscportablearchive() %{miscportablename}.tar.xz # JDK to use for bootstrapping -%global bootjdkpkg java-%{fakefeaturever}-openjdk +%global bootjdkpkg java-%{featurever}-%{origin} %ifarch %{fastdebug_arches} %global bootdebugpkg fastdebug %endif @@ -746,7 +744,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip BuildRequires: javapackages-filesystem -BuildRequires: %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} +BuildRequires: %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} >= %{buildjdkver} # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -1080,7 +1078,7 @@ pushd %{_jvmdir} sha256sum --check %{bootjdkzip}.sha256sum popd tar -xJf %{bootjdkzip} -mv java-%{fakefeaturever}-openjdk-%{buildjdkver}* %{bootjdk} +mv java-%{featurever}-openjdk-%{buildjdkver}* %{bootjdk} # Print release information echo "Installed boot JDK:" cat %{bootjdk}/release @@ -1969,6 +1967,21 @@ done %endif %changelog +* Mon Nov 10 2025 Andrew Hughes - 1:25.0.1.0.8-1 +- Update to jdk-25.0.1+8 (GA) +- Update release notes to 25.0.1+8 +- Related: RHELBU-3203 + +* Mon Nov 10 2025 Andrew Hughes - 1:25.0.0.0.36-2 +- Drop fakefeaturever and rebuild with ourselves now we have reached OpenJDK 25 +- Related: RHELBU-3203 + +* Sun Nov 09 2025 Andrew Hughes - 1:25.0.0.0.36-1 +- Update to jdk-25.0.0+36 (GA) +- Update release notes with features of JDK 25 +- Mention finalisation JEP for features finalised in JDK 22, 23 & 24 +- Resolves: RHELBU-3203 + * Wed Nov 05 2025 Andrew Hughes - 1:24.0.2.0.12-1 - Update to jdk-24.0.2+12 (GA) - Update release notes with features of JDK 24 diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index 136c13b..d9a04cd 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -2559,6 +2559,7 @@ exit 0 - Mention finalisation JEP for features finalised in JDK 22, 23 & 24 - Drop fakefeaturever now we have reached OpenJDK 25 - Update release notes to 25.0.1+8 +- Sync the copy of the portable specfile with the latest update - Resolves: RHEL-120553 * Wed Nov 05 2025 Andrew Hughes - 1:24.0.2.0.12-1