From a649d0c4729dee8cd711999f0a22b66a991f38af5204455fc313ce78d2273134 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 29 Apr 2024 14:55:04 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-errorprone?expand=0&rev=16 --- google-errorprone-annotations.changes | 5 +++++ google-errorprone-annotations.spec | 4 ++++ google-errorprone.spec | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/google-errorprone-annotations.changes b/google-errorprone-annotations.changes index 802ab58..0b78d1f 100644 --- a/google-errorprone-annotations.changes +++ b/google-errorprone-annotations.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 29 14:50:29 UTC 2024 - Fridrich Strba + +- The binaries are compatible with java 1.8 + ------------------------------------------------------------------- Mon Apr 15 05:13:37 UTC 2024 - Fridrich Strba diff --git a/google-errorprone-annotations.spec b/google-errorprone-annotations.spec index 3b7883b..9c01fbe 100644 --- a/google-errorprone-annotations.spec +++ b/google-errorprone-annotations.spec @@ -19,6 +19,9 @@ %global source_name error-prone %global artifactId error_prone_annotations %global group_name google-errorprone +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless Name: %{group_name}-annotations Version: 2.26.1 Release: 0 @@ -32,6 +35,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 9 BuildRequires: javapackages-local >= 6 +Requires: java-headless >= 1.8 BuildArch: noarch %description diff --git a/google-errorprone.spec b/google-errorprone.spec index 6387603..e3b2041 100644 --- a/google-errorprone.spec +++ b/google-errorprone.spec @@ -26,6 +26,7 @@ Group: Development/Libraries/Java URL: https://errorprone.info Source0: %{source_name}-%{version}.tar.xz BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) BuildRequires: mvn(com.google.auto.service:auto-service) @@ -42,6 +43,7 @@ common programming mistakes at compile-time. %package annotation Summary: @BugPattern annotation Group: Development/Libraries/Java +Requires: java-headless >= 1.8 %description annotation @BugPattern annotation for Google Error Prone @@ -49,6 +51,7 @@ Group: Development/Libraries/Java %package docgen_processor Summary: @BugPattern annotation processor Group: Development/Libraries/Java +Requires: java-headless >= 1.8 %description docgen_processor JSR-269 annotation processor for @BugPattern annotation @@ -56,6 +59,7 @@ JSR-269 annotation processor for @BugPattern annotation %package type_annotations Summary: error-prone type annotations Group: Development/Libraries/Java +Requires: java-headless >= 1.8 %description type_annotations Google Error Prone type annotations From e63c9f0c454e1a09dc80ba2968209338168df071f18f3d13042a5dd2ba964b5c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 29 Apr 2024 16:45:42 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-errorprone?expand=0&rev=17 --- google-errorprone.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/google-errorprone.spec b/google-errorprone.spec index e3b2041..6387603 100644 --- a/google-errorprone.spec +++ b/google-errorprone.spec @@ -26,7 +26,6 @@ Group: Development/Libraries/Java URL: https://errorprone.info Source0: %{source_name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) BuildRequires: mvn(com.google.auto.service:auto-service) @@ -43,7 +42,6 @@ common programming mistakes at compile-time. %package annotation Summary: @BugPattern annotation Group: Development/Libraries/Java -Requires: java-headless >= 1.8 %description annotation @BugPattern annotation for Google Error Prone @@ -51,7 +49,6 @@ Requires: java-headless >= 1.8 %package docgen_processor Summary: @BugPattern annotation processor Group: Development/Libraries/Java -Requires: java-headless >= 1.8 %description docgen_processor JSR-269 annotation processor for @BugPattern annotation @@ -59,7 +56,6 @@ JSR-269 annotation processor for @BugPattern annotation %package type_annotations Summary: error-prone type annotations Group: Development/Libraries/Java -Requires: java-headless >= 1.8 %description type_annotations Google Error Prone type annotations