Merge pull request #279 from vespa-engine/toregge/build-vespa-gradle-…

…8.11.1 Build vespa-gradle 8.11.1.
vespa-engine · Jan 4, 2025 · 97f545d · 97f545d
2 parents 48d847e + 4348e2d
commit 97f545d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/gradle/.copr/Makefile b/gradle/.copr/Makefile
@@ -4,9 +4,9 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
 # Version
 MAJOR=8
-MINOR=3
-PATCH=0
-VERSION=$(MAJOR).$(MINOR)
+MINOR=11
+PATCH=1
+VERSION=$(MAJOR).$(MINOR).$(PATCH)
 RELEASE=1
 
 RPMTOPDIR=$(TOP)/rpmbuild

diff --git a/gradle/vespa-gradle.spec.tmpl b/gradle/vespa-gradle.spec.tmpl
@@ -13,9 +13,18 @@ BuildArchitectures: noarch
 %define ver_patch _TMPL_VER_PATCH
 %define ver_release _TMPL_VER_RELEASE
 
+%if 0%{?fedora}
+%if %{fedora} > 41
+%global _vespa_java_version 21
+%endif
+%endif
+%if ! 0%{?_vespa_java_version:1}
+%global _vespa_java_version 17
+%endif
+
 Summary:        Gradle for building other 3rd party deps
 Name:           vespa-gradle
-Version:        %{ver_major}.%{ver_minor}
+Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
 Release:        %{ver_release}%{?dist}
 License:        Apache
 URL:            https://gradle.org/
@@ -27,7 +36,7 @@ Requires: java-17-amazon-corretto-devel
 Requires: java-17-amazon-corretto
 %else
 %if 0%{?el8} || 0%{?el9} || 0%{?fedora}
-Requires: java-17-openjdk-devel
+Requires: java-%{_vespa_java_version}-openjdk-devel
 %endif
 %endif