diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index f9b07d6..016ab92 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -315,7 +315,6 @@ # New Version-String scheme-style defines %global featurever 25 -%global fakefeaturever 25 %global interimver 0 %global updatever 0 %global patchver 0 @@ -358,8 +357,7 @@ %global crypto_policy_active false # 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 @@ -380,7 +378,7 @@ %global buildver 36 %global rpmrelease 1 # Settings used by the portable build -%global portablerelease 1 +%global portablerelease 2 # Portable suffix differs between RHEL and CentOS %if 0%{?centos} == 0 %global portablerhel %{?pkgos:7_9}%{!?pkgos:8} @@ -429,13 +427,13 @@ %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 installoutputdir() %{expand:install/jdk%{fakefeaturever}.install%{?1}} +%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} # we can copy the javadoc to not arched dir, or make it not noarch %define uniquejavadocdir() %{expand:%{compatiblename}%{?1}} # main id and dir of this jdk @@ -790,7 +788,7 @@ fi %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md -%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-%{fakefeaturever}-openjdk-portable.specfile +%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-%{featurever}-openjdk-portable.specfile %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/openjdk-devkit.specfile %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/0*.patch %dir %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}} @@ -1257,7 +1255,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 # Define the root name of the portable packages -%global pkgnameroot java-%{fakefeaturever}-%{origin}-portable%{?pkgos:-%{pkgos}} +%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}} # Define the architectures on which we build ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64 @@ -1278,7 +1276,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". Epoch: 1 -Summary: %{origin_nice} %{fakefeaturever} Runtime Environment +Summary: %{origin_nice} %{featurever} Runtime Environment # Groups are only used up to RHEL 8 and on Fedora versions prior to F30 %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages @@ -1302,7 +1300,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv URL: http://openjdk.java.net/ # The source tarball, generated using generate_source_tarball.sh -Source0: https://openjdk-sources.osci.io/openjdk%{fakefeaturever}/open%{vcstag}%{ea_designator_zip}.tar.xz +Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). @@ -1335,7 +1333,7 @@ Source18: TestTranslations.java # Include portable spec and instructions on how to rebuild Source19: README.md -Source20: java-%{fakefeaturever}-openjdk-portable.specfile +Source20: java-%{featurever}-openjdk-portable.specfile Source21: NEWS Source22: openjdk-devkit.specfile # Devkit patches; see https://github.com/rh-openjdk/jdk/tree/devkit @@ -1527,37 +1525,37 @@ Provides: bundled(sleef) = 3.6.1 %{java_rpo %{nil}} %description -The %{origin_nice} %{fakefeaturever} runtime environment. +The %{origin_nice} %{featurever} runtime environment. %if %{include_debug_build} %package slowdebug -Summary: %{origin_nice} %{fakefeaturever} Runtime Environment %{debug_on} +Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif %{java_rpo -- %{debug_suffix_unquoted}} %description slowdebug -The %{origin_nice} %{fakefeaturever} runtime environment. +The %{origin_nice} %{featurever} runtime environment. %{debug_warning} %endif %if %{include_fastdebug_build} %package fastdebug -Summary: %{origin_nice} %{fakefeaturever} Runtime Environment %{fastdebug_on} +Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif %{java_rpo -- %{fastdebug_suffix_unquoted}} %description fastdebug -The %{origin_nice} %{fakefeaturever} runtime environment. +The %{origin_nice} %{featurever} runtime environment. %{fastdebug_warning} %endif %if %{include_normal_build} %package headless -Summary: %{origin_nice} %{fakefeaturever} Headless Runtime Environment +Summary: %{origin_nice} %{featurever} Headless Runtime Environment %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1565,12 +1563,12 @@ Group: Development/Languages %{java_headless_rpo %{nil}} %description headless -The %{origin_nice} %{fakefeaturever} runtime environment without audio and video support. +The %{origin_nice} %{featurever} runtime environment without audio and video support. %endif %if %{include_debug_build} %package headless-slowdebug -Summary: %{origin_nice} %{fakefeaturever} Runtime Environment %{debug_on} +Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1578,13 +1576,13 @@ Group: Development/Languages %{java_headless_rpo -- %{debug_suffix_unquoted}} %description headless-slowdebug -The %{origin_nice} %{fakefeaturever} runtime environment without audio and video support. +The %{origin_nice} %{featurever} runtime environment without audio and video support. %{debug_warning} %endif %if %{include_fastdebug_build} %package headless-fastdebug -Summary: %{origin_nice} %{fakefeaturever} Runtime Environment %{fastdebug_on} +Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1592,13 +1590,13 @@ Group: Development/Languages %{java_headless_rpo -- %{fastdebug_suffix_unquoted}} %description headless-fastdebug -The %{origin_nice} %{fakefeaturever} runtime environment without audio and video support. +The %{origin_nice} %{featurever} runtime environment without audio and video support. %{fastdebug_warning} %endif %if %{include_normal_build} %package devel -Summary: %{origin_nice} %{fakefeaturever} Development Environment +Summary: %{origin_nice} %{featurever} Development Environment %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1606,12 +1604,12 @@ Group: Development/Languages %{java_devel_rpo %{nil}} %description devel -The %{origin_nice} %{fakefeaturever} development tools. +The %{origin_nice} %{featurever} development tools. %endif %if %{include_debug_build} %package devel-slowdebug -Summary: %{origin_nice} %{fakefeaturever} Development Environment %{debug_on} +Summary: %{origin_nice} %{featurever} Development Environment %{debug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1619,13 +1617,13 @@ Group: Development/Languages %{java_devel_rpo -- %{debug_suffix_unquoted}} %description devel-slowdebug -The %{origin_nice} %{fakefeaturever} development tools. +The %{origin_nice} %{featurever} development tools. %{debug_warning} %endif %if %{include_fastdebug_build} %package devel-fastdebug -Summary: %{origin_nice} %{fakefeaturever} Development Environment %{fastdebug_on} +Summary: %{origin_nice} %{featurever} Development Environment %{fastdebug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Tools %endif @@ -1633,7 +1631,7 @@ Group: Development/Tools %{java_devel_rpo -- %{fastdebug_suffix_unquoted}} %description devel-fastdebug -The %{origin_nice} %{fakefeaturever} development tools . +The %{origin_nice} %{featurever} development tools . %{fastdebug_warning} %endif @@ -1641,33 +1639,33 @@ The %{origin_nice} %{fakefeaturever} development tools . %if %{include_normal_build} %package static-libs -Summary: %{origin_nice} %{fakefeaturever} libraries for static linking +Summary: %{origin_nice} %{featurever} libraries for static linking %{java_static_libs_rpo %{nil}} %description static-libs -The %{origin_nice} %{fakefeaturever} libraries for static linking. +The %{origin_nice} %{featurever} libraries for static linking. %endif %if %{include_debug_build} %package static-libs-slowdebug -Summary: %{origin_nice} %{fakefeaturever} libraries for static linking %{debug_on} +Summary: %{origin_nice} %{featurever} libraries for static linking %{debug_on} %{java_static_libs_rpo -- %{debug_suffix_unquoted}} %description static-libs-slowdebug -The %{origin_nice} %{fakefeaturever} libraries for static linking. +The %{origin_nice} %{featurever} libraries for static linking. %{debug_warning} %endif %if %{include_fastdebug_build} %package static-libs-fastdebug -Summary: %{origin_nice} %{fakefeaturever} libraries for static linking %{fastdebug_on} +Summary: %{origin_nice} %{featurever} libraries for static linking %{fastdebug_on} %{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}} %description static-libs-fastdebug -The %{origin_nice} %{fakefeaturever} libraries for static linking. +The %{origin_nice} %{featurever} libraries for static linking. %{fastdebug_warning} %endif @@ -1676,7 +1674,7 @@ The %{origin_nice} %{fakefeaturever} libraries for static linking. %if %{include_normal_build} %package jmods -Summary: JMods for %{origin_nice} %{fakefeaturever} +Summary: JMods for %{origin_nice} %{featurever} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1684,12 +1682,12 @@ Group: Development/Languages %{java_jmods_rpo %{nil}} %description jmods -The JMods for %{origin_nice} %{fakefeaturever}. +The JMods for %{origin_nice} %{featurever}. %endif %if %{include_debug_build} %package jmods-slowdebug -Summary: JMods for %{origin_nice} %{fakefeaturever} %{debug_on} +Summary: JMods for %{origin_nice} %{featurever} %{debug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1697,13 +1695,13 @@ Group: Development/Languages %{java_jmods_rpo -- %{debug_suffix_unquoted}} %description jmods-slowdebug -The JMods for %{origin_nice} %{fakefeaturever}. +The JMods for %{origin_nice} %{featurever}. %{debug_warning} %endif %if %{include_fastdebug_build} %package jmods-fastdebug -Summary: JMods for %{origin_nice} %{fakefeaturever} %{fastdebug_on} +Summary: JMods for %{origin_nice} %{featurever} %{fastdebug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Tools %endif @@ -1711,13 +1709,13 @@ Group: Development/Tools %{java_jmods_rpo -- %{fastdebug_suffix_unquoted}} %description jmods-fastdebug -The JMods for %{origin_nice} %{fakefeaturever}. +The JMods for %{origin_nice} %{featurever}. %{fastdebug_warning} %endif %if %{include_normal_build} %package demo -Summary: %{origin_nice} %{fakefeaturever} Demos +Summary: %{origin_nice} %{featurever} Demos %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1725,12 +1723,12 @@ Group: Development/Languages %{java_demo_rpo %{nil}} %description demo -The %{origin_nice} %{fakefeaturever} demos. +The %{origin_nice} %{featurever} demos. %endif %if %{include_debug_build} %package demo-slowdebug -Summary: %{origin_nice} %{fakefeaturever} Demos %{debug_on} +Summary: %{origin_nice} %{featurever} Demos %{debug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1738,13 +1736,13 @@ Group: Development/Languages %{java_demo_rpo -- %{debug_suffix_unquoted}} %description demo-slowdebug -The %{origin_nice} %{fakefeaturever} demos. +The %{origin_nice} %{featurever} demos. %{debug_warning} %endif %if %{include_fastdebug_build} %package demo-fastdebug -Summary: %{origin_nice} %{fakefeaturever} Demos %{fastdebug_on} +Summary: %{origin_nice} %{featurever} Demos %{fastdebug_on} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1752,13 +1750,13 @@ Group: Development/Languages %{java_demo_rpo -- %{fastdebug_suffix_unquoted}} %description demo-fastdebug -The %{origin_nice} %{fakefeaturever} demos. +The %{origin_nice} %{featurever} demos. %{fastdebug_warning} %endif %if %{include_normal_build} %package src -Summary: %{origin_nice} %{fakefeaturever} Source Bundle +Summary: %{origin_nice} %{featurever} Source Bundle %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1766,13 +1764,13 @@ Group: Development/Languages %{java_src_rpo %{nil}} %description src -The %{compatiblename}-src sub-package contains the complete %{origin_nice} %{fakefeaturever} +The %{compatiblename}-src sub-package contains the complete %{origin_nice} %{featurever} class library source code for use by IDE indexers and debuggers. %endif %if %{include_debug_build} %package src-slowdebug -Summary: %{origin_nice} %{fakefeaturever} Source Bundle %{for_debug} +Summary: %{origin_nice} %{featurever} Source Bundle %{for_debug} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1780,13 +1778,13 @@ Group: Development/Languages %{java_src_rpo -- %{debug_suffix_unquoted}} %description src-slowdebug -The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_nice} %{fakefeaturever} +The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_nice} %{featurever} class library source code for use by IDE indexers and debuggers, %{for_debug}. %endif %if %{include_fastdebug_build} %package src-fastdebug -Summary: %{origin_nice} %{fakefeaturever} Source Bundle %{for_fastdebug} +Summary: %{origin_nice} %{featurever} Source Bundle %{for_fastdebug} %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Development/Languages %endif @@ -1794,13 +1792,13 @@ Group: Development/Languages %{java_src_rpo -- %{fastdebug_suffix_unquoted}} %description src-fastdebug -The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_nice} %{fakefeaturever} +The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_nice} %{featurever} class library source code for use by IDE indexers and debuggers, %{for_fastdebug}. %endif %if %{include_normal_build} %package javadoc -Summary: %{origin_nice} %{fakefeaturever} API documentation +Summary: %{origin_nice} %{featurever} API documentation %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Documentation %endif @@ -1816,9 +1814,9 @@ Requires(postun): %{alternatives_requires} %{java_javadoc_rpo -- %{nil}} %description javadoc -The %{origin_nice} %{fakefeaturever} API documentation. +The %{origin_nice} %{featurever} API documentation. %package javadoc-zip -Summary: %{origin_nice} %{fakefeaturever} API documentation compressed in a single archive +Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) Group: Documentation %endif @@ -1835,7 +1833,7 @@ Requires(postun): %{alternatives_requires} %{java_javadoc_rpo -- %{nil}} %description javadoc-zip -The %{origin_nice} %{fakefeaturever} API documentation compressed in a single archive. +The %{origin_nice} %{featurever} API documentation compressed in a single archive. %endif %prep @@ -1968,11 +1966,11 @@ mkdir -p $(dirname %{installoutputdir}) docdir=%{installoutputdir -- "-docs"} tar -xJf %{docszip} -mv java-%{fakefeaturever}-openjdk*.docs.* ${docdir} +mv java-%{featurever}-openjdk*.docs.* ${docdir} miscdir=%{installoutputdir -- "-misc"} tar -xJf %{misczip} -mv java-%{fakefeaturever}-openjdk*.misc.* ${miscdir} +mv java-%{featurever}-openjdk*.misc.* ${miscdir} for suffix in %{build_loop} ; do @@ -1992,7 +1990,7 @@ for suffix in %{build_loop} ; do # TODO: should verify checksums when using packages from buildroot tar -xJf ${jdkzip} tar -xJf ${staticlibzip} - mv java-%{fakefeaturever}-openjdk* ${installdir} + mv java-%{featurever}-openjdk* ${installdir} # Fix build paths in ELF files so it looks like we built them portablenvr="%{name}-%{VERSION}-%{prelease}.%{portablesuffix}.%{_arch}" @@ -2559,6 +2557,7 @@ exit 0 - 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 +- Drop fakefeaturever now we have reached OpenJDK 25 - Related: RHEL-120553 * Wed Nov 05 2025 Andrew Hughes - 1:24.0.2.0.12-1