Skip to content

Commit c3a63c4

Browse files
committed
Try to get CentOs /Rhel to build in copr.
Simplify if block that determines java jdk version.
1 parent e536f64 commit c3a63c4

1 file changed

Lines changed: 17 additions & 5 deletions

File tree

jss.spec

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,32 @@ ExcludeArch: i686
7575

7676
# maven-local is a subpackage of javapackages-tools
7777

78-
%if 0%{?fedora} >= %{fedora_cutoff} || 0%{?rhel} >= 10
78+
%if 0%{?rhel} && 0%{?rhel} <= 9
7979

80-
%define java_devel java-25-openjdk-devel
81-
%define java_headless java-25-openjdk-headless
82-
%define java_home %{_jvmdir}/jre-25-openjdk
83-
%define maven_local maven-local-openjdk25
80+
%define java_devel java-17-openjdk-devel
81+
%define java_headless java-17-openjdk-headless
82+
%define java_home %{_jvmdir}/jre-17-openjdk
83+
%define maven_local maven-local-openjdk17
8484

8585
%else
8686

87+
%if 0%{?fedora} < %{fedora_cutoff} || 0%{?rhel} >= 10
88+
8789
%define java_devel java-21-openjdk-devel
8890
%define java_headless java-21-openjdk-headless
8991
%define java_home %{_jvmdir}/jre-21-openjdk
9092
%define maven_local maven-local
9193

94+
%else
95+
# fedora >= 43
96+
97+
%define java_devel java-25-openjdk-devel
98+
%define java_headless java-25-openjdk-headless
99+
%define java_home %{_jvmdir}/jre-25-openjdk
100+
%define maven_local maven-local-openjdk25
101+
102+
%endif
103+
92104
%endif
93105

94106
################################################################################

0 commit comments

Comments
 (0)