diff --git a/base/comps/java-25-openjdk-portable/java-25-openjdk-portable.comp.toml b/base/comps/java-25-openjdk-portable/java-25-openjdk-portable.comp.toml index 9bc12b8c493..79932c23de5 100644 --- a/base/comps/java-25-openjdk-portable/java-25-openjdk-portable.comp.toml +++ b/base/comps/java-25-openjdk-portable/java-25-openjdk-portable.comp.toml @@ -11,6 +11,20 @@ # Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} release = { calculation = "manual" } spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "cad9d5a1ed48cf7e9e12cfadfdacc11f523d46cb" } +# Disable slowdebug variant builds; we don't ship -slowdebug subpackages. +build.without = ["slowdebug"] + +[components.java-25-openjdk-portable.build.defines] +# AZL-only release counter. Added to upstream's %{rpmrelease} so the final +# Release tag is a single number (Fedora-style schema). Bump when shipping +# new AZL-only changes on top of the pinned upstream commit. +azl_release = "2" + +[[components.java-25-openjdk-portable.overlays]] +description = "Add azl_release to upstream %{rpmrelease} so we can bump release independently of upstream while keeping a single-number Fedora-style Release schema" +type = "spec-search-replace" +regex = '^Release:\s+%\{\?eaprefix\}%\{rpmrelease\}%\{\?extraver\}%\{\?dist\}$' +replacement = 'Release: %{?eaprefix}%[%{rpmrelease} + %{azl_release}]%{?extraver}%{?dist}' [[components.java-25-openjdk-portable.overlays]] description = "Override buildjdkver to use Java 25 instead of 24 for bootstrap" diff --git a/base/comps/java-25-openjdk/java-25-openjdk.comp.toml b/base/comps/java-25-openjdk/java-25-openjdk.comp.toml index a6842dd584c..9d65c43c3e0 100644 --- a/base/comps/java-25-openjdk/java-25-openjdk.comp.toml +++ b/base/comps/java-25-openjdk/java-25-openjdk.comp.toml @@ -4,4 +4,18 @@ release = { calculation = "manual" } # Current java-25 build requires java-25-openjdk-portable-sources version 25.0.20.0.10. # Fed43 portable rpm delivers 25.0.0.0.32. Fedora43 builds work with Fed42 rpm. To # unblock our build, we pin to the last Fedora 43 commit when version was 25.0.0.0.32. -spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "6011214a0e0e5c6302d0d59b6e8805d049749420" } +spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "5443056bc5b97bcc78e36144b6a28b8937dc6cee" } +# Disable slowdebug variant builds; we don't ship -slowdebug subpackages. +build.without = ["slowdebug"] + +[components.java-25-openjdk.build.defines] +# AZL-only release counter. Added to upstream's %{rpmrelease} so the final +# Release tag is a single number (Fedora-style schema). Bump when shipping +# new AZL-only changes on top of the pinned upstream commit. +azl_release = "2" + +[[components.java-25-openjdk.overlays]] +description = "Add azl_release to upstream %{rpmrelease} so we can bump release independently of upstream while keeping a single-number Fedora-style Release schema" +type = "spec-search-replace" +regex = '^Release:\s+%\{\?eaprefix\}%\{rpmrelease\}%\{\?extraver\}%\{\?dist\}$' +replacement = 'Release: %{?eaprefix}%[%{rpmrelease} + %{azl_release}]%{?extraver}%{?dist}' diff --git a/base/packages/base.packages.toml b/base/packages/base.packages.toml index a2751f3c4cf..7a6f53c1916 100644 --- a/base/packages/base.packages.toml +++ b/base/packages/base.packages.toml @@ -2469,26 +2469,19 @@ packages = [ "java-25-openjdk", # srpm: java-25-openjdk "java-25-openjdk-demo", # srpm: java-25-openjdk "java-25-openjdk-demo-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-demo-slowdebug", # srpm: java-25-openjdk "java-25-openjdk-devel", # srpm: java-25-openjdk "java-25-openjdk-devel-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-devel-slowdebug", # srpm: java-25-openjdk "java-25-openjdk-fastdebug", # srpm: java-25-openjdk "java-25-openjdk-headless", # srpm: java-25-openjdk "java-25-openjdk-headless-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-headless-slowdebug", # srpm: java-25-openjdk "java-25-openjdk-javadoc", # srpm: java-25-openjdk "java-25-openjdk-javadoc-zip", # srpm: java-25-openjdk "java-25-openjdk-jmods", # srpm: java-25-openjdk "java-25-openjdk-jmods-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-jmods-slowdebug", # srpm: java-25-openjdk - "java-25-openjdk-slowdebug", # srpm: java-25-openjdk "java-25-openjdk-src", # srpm: java-25-openjdk "java-25-openjdk-src-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-src-slowdebug", # srpm: java-25-openjdk "java-25-openjdk-static-libs", # srpm: java-25-openjdk "java-25-openjdk-static-libs-fastdebug", # srpm: java-25-openjdk - "java-25-openjdk-static-libs-slowdebug", # srpm: java-25-openjdk "java-hdf", # srpm: hdf "java-hdf5", # srpm: hdf5 "java-srpm-macros", # srpm: java-rpm-macros diff --git a/base/packages/sdk.packages.toml b/base/packages/sdk.packages.toml index 4c5a28e6216..012a6e8444d 100644 --- a/base/packages/sdk.packages.toml +++ b/base/packages/sdk.packages.toml @@ -2754,15 +2754,12 @@ packages = [ "java-25-openjdk-portable", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-devel", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-devel-fastdebug", # srpm: java-25-openjdk-portable - "java-25-openjdk-portable-devel-slowdebug", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-docs", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-fastdebug", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-misc", # srpm: java-25-openjdk-portable - "java-25-openjdk-portable-slowdebug", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-sources", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-static-libs", # srpm: java-25-openjdk-portable "java-25-openjdk-portable-static-libs-fastdebug", # srpm: java-25-openjdk-portable - "java-25-openjdk-portable-static-libs-slowdebug", # srpm: java-25-openjdk-portable "java-z3", # srpm: z3 "javascriptcoregtk4.1", # srpm: webkitgtk "javascriptcoregtk4.1-devel", # srpm: webkitgtk diff --git a/locks/java-25-openjdk-portable.lock b/locks/java-25-openjdk-portable.lock index f125d08ccfe..29a3a47b19b 100644 --- a/locks/java-25-openjdk-portable.lock +++ b/locks/java-25-openjdk-portable.lock @@ -2,5 +2,5 @@ version = 1 import-commit = 'cad9d5a1ed48cf7e9e12cfadfdacc11f523d46cb' upstream-commit = 'cad9d5a1ed48cf7e9e12cfadfdacc11f523d46cb' -input-fingerprint = 'sha256:f850b6f1b70adb638e157095b4cc3fdec86506fae5e80e7d762001664c2ffcbc' +input-fingerprint = 'sha256:36c3198173416602b88b0c9bacc6b27ad47b4ec6443bfd6d63e42425d333327b' resolution-input-hash = 'sha256:0202eb9270e8e00e99a72f294e2d072d2bfb8009bfd6cc7fdd72b7bec3fb3996' diff --git a/locks/java-25-openjdk.lock b/locks/java-25-openjdk.lock index badd81b2d66..76485a57ea1 100644 --- a/locks/java-25-openjdk.lock +++ b/locks/java-25-openjdk.lock @@ -1,6 +1,6 @@ # Managed by azldev component update. Do not edit manually. version = 1 import-commit = '6011214a0e0e5c6302d0d59b6e8805d049749420' -upstream-commit = '6011214a0e0e5c6302d0d59b6e8805d049749420' -input-fingerprint = 'sha256:3c695fbce90d61e0a02fd98c0e2f4e7df71b024abb161ac8d53a78926334ebf8' -resolution-input-hash = 'sha256:aa5bcc89986249fcdfffe18cd72d6c06ca089b1525e9d5ebf286dcb165665da7' +upstream-commit = '5443056bc5b97bcc78e36144b6a28b8937dc6cee' +input-fingerprint = 'sha256:c6e3f9d260d8207c81481c4ebf94d5c38df31724b77d1f47f83885fe5fe4e5ff' +resolution-input-hash = 'sha256:6ff9dbb2a003cbeff4de0aaad04fa74dd672d8b4431d3025412a6f78978c3259' diff --git a/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.azl.macros b/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.azl.macros new file mode 100644 index 00000000000..23da2f63610 --- /dev/null +++ b/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.azl.macros @@ -0,0 +1,4 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%_without_slowdebug 1 +%azl_release 2 diff --git a/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.spec b/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.spec index c1fa17ad1cd..124cafa7d58 100644 --- a/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.spec +++ b/specs/j/java-25-openjdk-portable/java-25-openjdk-portable.spec @@ -6,6 +6,9 @@ # This spec file has been modified by azldev to include build configuration overlays. # Do not edit manually; changes may be overwritten. +# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added. +%{load:%{_sourcedir}/java-25-openjdk-portable.azl.macros} + %if (0%{?rhel} > 0 && 0%{?rhel} < 8) # portable jdk 17 specific bug, _jvmdir being missing %define _jvmdir /usr/lib/jvm @@ -572,7 +575,7 @@ ExcludeArch: %{ix86} Name: java-25-%{origin}-portable%{?pkgos:-%{pkgos}} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%[%{rpmrelease} + %{azl_release}]%{?extraver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -644,6 +647,7 @@ Source16: CheckVendor.java # Ensure translations are available for new timezones Source18: TestTranslations.java +Source9999: java-25-openjdk-portable.azl.macros ############################################ # @@ -1736,6 +1740,9 @@ done %changelog ## START: Generated by rpmautospec +* Sat May 09 2026 Chris Co - 1:25.0.0.0.32-3 +- fix(java): disable slowdebug variant and bump release for openjdk + * Thu Apr 30 2026 Daniel McIlvaney - 1:25.0.0.0.32-2 - feat: introduce deterministic commit resolution via Azure Linux lock file diff --git a/specs/j/java-25-openjdk/java-25-openjdk.azl.macros b/specs/j/java-25-openjdk/java-25-openjdk.azl.macros new file mode 100644 index 00000000000..23da2f63610 --- /dev/null +++ b/specs/j/java-25-openjdk/java-25-openjdk.azl.macros @@ -0,0 +1,4 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%_without_slowdebug 1 +%azl_release 2 diff --git a/specs/j/java-25-openjdk/java-25-openjdk.spec b/specs/j/java-25-openjdk/java-25-openjdk.spec index f123d37f3e6..5929f2887d1 100644 --- a/specs/j/java-25-openjdk/java-25-openjdk.spec +++ b/specs/j/java-25-openjdk/java-25-openjdk.spec @@ -6,6 +6,9 @@ # This spec file has been modified by azldev to include build configuration overlays. # Do not edit manually; changes may be overwritten. +# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added. +%{load:%{_sourcedir}/java-25-openjdk.azl.macros} + # RPM conditionals so as to be able to dynamically produce # slowdebug/release builds. See: # http://rpm.org/user_doc/conditional_builds.html @@ -350,7 +353,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 32 -%global rpmrelease 3 +%global rpmrelease 4 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1177,7 +1180,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-25-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%[%{rpmrelease} + %{azl_release}]%{?extraver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1235,6 +1238,7 @@ Source16: CheckVendor.java # Ensure translations are available for new timezones Source18: TestTranslations.java +Source9999: java-25-openjdk.azl.macros BuildRequires: %{portable_name}-sources >= %{portable_version} BuildRequires: %{portable_name}-misc >= %{portable_version} @@ -2401,6 +2405,12 @@ exit 0 %changelog ## START: Generated by rpmautospec +* Sat May 09 2026 Chris Co - 1:25.0.0.0.32-7 +- fix(java): disable slowdebug variant and bump release for openjdk + +* Wed Jul 30 2025 Jiri Vanek - 1:25.0.0.0.32-6 +- Bumped release + * Thu Apr 30 2026 Daniel McIlvaney - 1:25.0.0.0.32-5 - feat: introduce deterministic commit resolution via Azure Linux lock file