From aaf3d6cc89808aaef0269eaae50bcc8b68d6ec1e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Aug 2023 10:24:34 +0200 Subject: [PATCH] Build with default JDK 17 --- guava.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/guava.spec b/guava.spec index e601693..1c6916c 100644 --- a/guava.spec +++ b/guava.spec @@ -2,7 +2,7 @@ Name: guava Version: 31.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Google Core Libraries for Java # Most of the code is under ASL 2.0 # Few classes are under CC0, grep for creativecommons @@ -15,10 +15,10 @@ Source0: https://github.com/google/guava/archive/v%{version}/guava-%{vers BuildRequires: javapackages-extra %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 -BuildRequires: %{?module_prefix}mvn(com.google.code.findbugs:jsr305) +BuildRequires: maven-local +BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -97,6 +97,9 @@ find . -name '*.jar' -delete %files testlib -f .mfiles-guava-testlib %changelog +* Tue Aug 15 2023 Mikolaj Izdebski - 31.1-5 +- Build with default JDK 17 + * Thu Jul 20 2023 Fedora Release Engineering - 31.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild