From cfb726752921eade6c5f49420f35ce2588cf27de Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Thu, 30 Jul 2026 17:27:55 +0000 Subject: [PATCH] fix(l10n-maven-plugin,libidn,libsvm): use JDK 25 javapackages-tools no longer exposes the generic maven-local and javapackages-local capabilities after dropping OpenJDK 21 support. Backport Fedora's consumer migrations to the explicit OpenJDK 25 providers and build libsvm's Java interface with java-25-devel, restoring Stage 2 dependency resolution without reintroducing generic provides. Signed-off-by: Mitch Zhu --- base/comps/components.toml | 3 --- .../l10n-maven-plugin.comp.toml | 12 ++++++++++ base/comps/libidn/libidn.comp.toml | 14 ++++++++++++ base/comps/libsvm/libsvm.comp.toml | 1 + ...001-use-openjdk25-build-tools.overlay.toml | 22 +++++++++++++++++++ locks/l10n-maven-plugin.lock | 2 +- locks/libidn.lock | 2 +- locks/libsvm.lock | 2 +- .../l10n-maven-plugin/l10n-maven-plugin.spec | 7 ++++-- specs/l/libidn/libidn.spec | 4 ++-- specs/l/libsvm/libsvm.spec | 9 +++++--- 11 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 base/comps/l10n-maven-plugin/l10n-maven-plugin.comp.toml create mode 100644 base/comps/libidn/libidn.comp.toml create mode 100644 base/comps/libsvm/libsvm.comp.toml create mode 100644 base/comps/libsvm/overlays/0001-use-openjdk25-build-tools.overlay.toml diff --git a/base/comps/components.toml b/base/comps/components.toml index e25a76d0814..21e42b7f4f6 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -1614,7 +1614,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.kwrited] [components.kyotocabinet] [components.kyua] -[components.l10n-maven-plugin] [components.ladspa] [components.lame] [components.langpacks] @@ -1763,7 +1762,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.libical] [components.libicns] [components.libid3tag] -[components.libidn] [components.libidn2] [components.libiec61883] [components.libieee1284] @@ -1896,7 +1894,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.libssh] [components.libssh2] [components.libstoragemgmt] -[components.libsvm] [components.libtalloc] [components.libtasn1] [components.libtatsu] diff --git a/base/comps/l10n-maven-plugin/l10n-maven-plugin.comp.toml b/base/comps/l10n-maven-plugin/l10n-maven-plugin.comp.toml new file mode 100644 index 00000000000..e011412d27c --- /dev/null +++ b/base/comps/l10n-maven-plugin/l10n-maven-plugin.comp.toml @@ -0,0 +1,12 @@ +[components.l10n-maven-plugin] + +[[components.l10n-maven-plugin.overlays]] +description = "Use the OpenJDK 25 maven-local provider" +type = "spec-search-replace" +regex = '^BuildRequires:\s+maven-local$' +replacement = "BuildRequires: maven-local-openjdk25" + +[components.l10n-maven-plugin.overlays.metadata] +category = "upstream-backport" +upstream-status = "upstreamed" +commits = [{ url = "https://src.fedoraproject.org/rpms/l10n-maven-plugin/c/192a9a20e740d2308310e7525e16b40e5fe079b7" }] \ No newline at end of file diff --git a/base/comps/libidn/libidn.comp.toml b/base/comps/libidn/libidn.comp.toml new file mode 100644 index 00000000000..cb828c544c6 --- /dev/null +++ b/base/comps/libidn/libidn.comp.toml @@ -0,0 +1,14 @@ +[components.libidn] + +[[components.libidn.overlays]] +description = "Use the OpenJDK 25 javapackages-local provider" +type = "spec-search-replace" +section = "%package" +package = "java" +regex = '^BuildRequires:\s+javapackages-local$' +replacement = "BuildRequires: javapackages-local-openjdk25" + +[components.libidn.overlays.metadata] +category = "upstream-backport" +upstream-status = "upstreamed" +commits = [{ url = "https://src.fedoraproject.org/rpms/libidn/c/e246a509d6ad317cec538d17fad6a209d6869e4b" }] \ No newline at end of file diff --git a/base/comps/libsvm/libsvm.comp.toml b/base/comps/libsvm/libsvm.comp.toml new file mode 100644 index 00000000000..7638c71a552 --- /dev/null +++ b/base/comps/libsvm/libsvm.comp.toml @@ -0,0 +1 @@ +[components.libsvm] diff --git a/base/comps/libsvm/overlays/0001-use-openjdk25-build-tools.overlay.toml b/base/comps/libsvm/overlays/0001-use-openjdk25-build-tools.overlay.toml new file mode 100644 index 00000000000..b2b2a843eb7 --- /dev/null +++ b/base/comps/libsvm/overlays/0001-use-openjdk25-build-tools.overlay.toml @@ -0,0 +1,22 @@ +# Build the Java interface with the explicit OpenJDK 25 toolchain after Fedora +# removed the generic Java packaging providers. +[metadata] +category = "upstream-backport" +upstream-status = "upstreamed" +commits = [{ url = "https://src.fedoraproject.org/rpms/libsvm/c/b920f3188571c82eefa605564533c0171550ee01" }] + +[[overlays]] +description = "Build the Java interface with OpenJDK 25" +type = "spec-search-replace" +section = "%package" +package = "java" +regex = '^BuildRequires:\s+java-devel$' +replacement = "BuildRequires: java-25-devel" + +[[overlays]] +description = "Use the OpenJDK 25 maven-local provider" +type = "spec-search-replace" +section = "%package" +package = "java" +regex = '^BuildRequires:\s+maven-local$' +replacement = "BuildRequires: maven-local-openjdk25" diff --git a/locks/l10n-maven-plugin.lock b/locks/l10n-maven-plugin.lock index d531daa6451..72e4a2495e6 100644 --- a/locks/l10n-maven-plugin.lock +++ b/locks/l10n-maven-plugin.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '05155b0f14b8043080217b4058dbbf7aead8dd20' upstream-commit = '05155b0f14b8043080217b4058dbbf7aead8dd20' -input-fingerprint = 'sha256:6fe99612f91d6a2c4d03dbfe54e19ef9f05eb8dd49913bf7fb33ffdf2c608293' +input-fingerprint = 'sha256:12f6cef8f763c3dc26a834901794d145f895c0618bf6ba2e1e58270dd500db97' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/locks/libidn.lock b/locks/libidn.lock index 8f898835700..723a9d922e2 100644 --- a/locks/libidn.lock +++ b/locks/libidn.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '2099093724f3ec45cbca50f8d3d7de558d6d022f' upstream-commit = '2099093724f3ec45cbca50f8d3d7de558d6d022f' -input-fingerprint = 'sha256:8d5ec0338c2a1d034c82fb854a6de3231ef035646bace6b1baccaec26696c5fc' +input-fingerprint = 'sha256:238678de13dc5c1fd9b8d40d58e5f62449e04153beafa8dab32a27a9784ca812' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/locks/libsvm.lock b/locks/libsvm.lock index dd0f865b4ef..a4ffffd0549 100644 --- a/locks/libsvm.lock +++ b/locks/libsvm.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '0a65937a76daa7630cb2aafa224c3e26a6db6839' upstream-commit = '0a65937a76daa7630cb2aafa224c3e26a6db6839' -input-fingerprint = 'sha256:cb89286cf85d3428e734ef398eec300fc0b8e71caaa82eb8795992956b283cd2' +input-fingerprint = 'sha256:04ed27dc2300a16a39d09773025fa04dffc6698a32aed97a213fa4cd18b916fa' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/l/l10n-maven-plugin/l10n-maven-plugin.spec b/specs/l/l10n-maven-plugin/l10n-maven-plugin.spec index c0ff51d2f3c..7b0189469c6 100644 --- a/specs/l/l10n-maven-plugin/l10n-maven-plugin.spec +++ b/specs/l/l10n-maven-plugin/l10n-maven-plugin.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 3; + release_number = 4; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -26,7 +26,7 @@ Source: %{giturl}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -73,6 +73,9 @@ API documentation for %{name}. %changelog ## START: Generated by rpmautospec +* Thu Jul 30 2026 Mitch Zhu - 1.1.0-4 +- fix(l10n-maven-plugin,libidn,libsvm): use JDK 25 + * Thu Apr 30 2026 Daniel McIlvaney - 1.1.0-3 - feat: introduce deterministic commit resolution via Azure Linux lock file diff --git a/specs/l/libidn/libidn.spec b/specs/l/libidn/libidn.spec index d9fd3dcebbc..ddaa4fe840c 100644 --- a/specs/l/libidn/libidn.spec +++ b/specs/l/libidn/libidn.spec @@ -12,7 +12,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.43 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: (LGPL-3.0-or-later OR GPL-2.0-or-later) AND GPL-3.0-or-later AND GFDL-1.3-or-later Source0: https://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -64,7 +64,7 @@ developing programs which use the GNU libidn library. %package java Summary: Java port of the GNU Libidn library BuildRequires: java-devel -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(junit:junit) BuildRequires: make diff --git a/specs/l/libsvm/libsvm.spec b/specs/l/libsvm/libsvm.spec index 0bc546df5de..7f5535e7f0b 100644 --- a/specs/l/libsvm/libsvm.spec +++ b/specs/l/libsvm/libsvm.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -89,9 +89,9 @@ develop programs with libsvm in Python3. %if %{with java} %package java Summary: Java tools and interfaces for libsvm -BuildRequires: java-devel +BuildRequires: java-25-devel BuildRequires: javapackages-tools -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildArch: noarch Requires: javapackages-tools Requires: %{name} = %{version}-%{release} @@ -315,6 +315,9 @@ cp -p README java/README-Java %changelog ## START: Generated by rpmautospec +* Thu Jul 30 2026 Mitch Zhu - 3.37-3 +- fix(l10n-maven-plugin,libidn,libsvm): use JDK 25 + * Thu Apr 30 2026 Daniel McIlvaney - 3.37-2 - feat: introduce deterministic commit resolution via Azure Linux lock file