Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build vespa-gradle 8.11.1. #279

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Build vespa-gradle 8.11.1. #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle/.copr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions gradle/vespa-gradle.spec.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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

Expand Down