From f0a7bf123d8874d1632aa6f9ee85ba80af0fd0ff Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Wed, 26 Nov 2025 22:27:43 +0530 Subject: [PATCH 1/8] rpm: Require temurin-21-jre to replace deprecated OpenJDK packages (fixes #516) --- rpm/build/SPECS/jenkins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 019f7ac3..7be4cb71 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -19,9 +19,9 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version} # So either we make a hard requirement on the OpenJDK or none at all # Only workaround would be to use a java virtual package, see https://github.com/keystep/virtual-java-rpm # TODO: If re-enable, fix the matcher for Java 17 -# Requires: java >= 1:1.8.0 +# Fedora 42+ removes openjdk-{8,11,17}. Jenkins now uses Eclipse Temurin JDK 21. +Requires: temurin-21-jre Requires: procps -Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd BuildArch: noarch %systemd_requires From 6be38797794d2604bb76f6a3534aee89f55158f9 Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Thu, 27 Nov 2025 01:53:50 +0530 Subject: [PATCH 2/8] Apply conditional Temurin dependency only for Fedora builds --- rpm/build/SPECS/jenkins.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 7be4cb71..72c13574 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -20,7 +20,11 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version} # Only workaround would be to use a java virtual package, see https://github.com/keystep/virtual-java-rpm # TODO: If re-enable, fix the matcher for Java 17 # Fedora 42+ removes openjdk-{8,11,17}. Jenkins now uses Eclipse Temurin JDK 21. +%if 0%{?fedora} Requires: temurin-21-jre +%else +Requires: java >= 11 +%endif Requires: procps BuildArch: noarch %systemd_requires From 432ab889d15360ef803dac22479549eb14bc333a Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Thu, 27 Nov 2025 16:04:28 +0530 Subject: [PATCH 3/8] Fix: Update Java dependency for Fedora to java >= 21 --- rpm/build/SPECS/jenkins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 72c13574..35c23cc3 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version} # TODO: If re-enable, fix the matcher for Java 17 # Fedora 42+ removes openjdk-{8,11,17}. Jenkins now uses Eclipse Temurin JDK 21. %if 0%{?fedora} -Requires: temurin-21-jre +Requires: java >= 21 %else Requires: java >= 11 %endif From 0f463c54f01a511572f2c9c7edf1f2e7da228e04 Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Thu, 27 Nov 2025 16:43:43 +0530 Subject: [PATCH 4/8] Fix: Update Java dependency to java >= 17 for non-Fedora systems --- rpm/build/SPECS/jenkins.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 35c23cc3..a7560a27 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -21,9 +21,10 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version} # TODO: If re-enable, fix the matcher for Java 17 # Fedora 42+ removes openjdk-{8,11,17}. Jenkins now uses Eclipse Temurin JDK 21. %if 0%{?fedora} +%if 0%{?fedora} Requires: java >= 21 %else -Requires: java >= 11 +Requires: java >= 17 %endif Requires: procps BuildArch: noarch From a72b6b1ddccc83c2018773dad6c77aaf8f15671b Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Thu, 27 Nov 2025 16:52:35 +0530 Subject: [PATCH 5/8] Fix: correct java requirement syntax --- rpm/build/SPECS/jenkins.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index a7560a27..3ea5e605 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -21,7 +21,6 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version} # TODO: If re-enable, fix the matcher for Java 17 # Fedora 42+ removes openjdk-{8,11,17}. Jenkins now uses Eclipse Temurin JDK 21. %if 0%{?fedora} -%if 0%{?fedora} Requires: java >= 21 %else Requires: java >= 17 From 61ec483fcd9c008f97b62c25fc5243fbf939ce48 Mon Sep 17 00:00:00 2001 From: viru0909-dev Date: Thu, 27 Nov 2025 20:38:52 +0530 Subject: [PATCH 6/8] Restore Requires(pre) line as requested by reviewer --- rpm/build/SPECS/jenkins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 3ea5e605..c1b29ee6 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -25,6 +25,7 @@ Requires: java >= 21 %else Requires: java >= 17 %endif +Requires(pre): /usr/sbin/useradd , /usr/sbin/groupadd Requires: procps BuildArch: noarch %systemd_requires From 50a84c388a673af875ab39c4ceee4a6a79fae597 Mon Sep 17 00:00:00 2001 From: Virendra Gadekar Date: Thu, 27 Nov 2025 22:30:08 +0530 Subject: [PATCH 7/8] Update rpm/build/SPECS/jenkins.spec Co-authored-by: Damien Duportal --- rpm/build/SPECS/jenkins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index c1b29ee6..9ac46acb 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -25,8 +25,8 @@ Requires: java >= 21 %else Requires: java >= 17 %endif -Requires(pre): /usr/sbin/useradd , /usr/sbin/groupadd Requires: procps +Requires(pre): /usr/sbin/useradd , /usr/sbin/groupadd BuildArch: noarch %systemd_requires From cacc8c4b1f878f405f8301a8145867a0dca7c824 Mon Sep 17 00:00:00 2001 From: Virendra Gadekar Date: Thu, 27 Nov 2025 22:42:25 +0530 Subject: [PATCH 8/8] Update rpm/build/SPECS/jenkins.spec Co-authored-by: Damien Duportal --- rpm/build/SPECS/jenkins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/build/SPECS/jenkins.spec b/rpm/build/SPECS/jenkins.spec index 9ac46acb..71f0c4f6 100644 --- a/rpm/build/SPECS/jenkins.spec +++ b/rpm/build/SPECS/jenkins.spec @@ -26,7 +26,7 @@ Requires: java >= 21 Requires: java >= 17 %endif Requires: procps -Requires(pre): /usr/sbin/useradd , /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd BuildArch: noarch %systemd_requires