From 32f97f8043a227d8548b77de0fe929f6a9a773dd8000e36074d02bd8da8ab8c4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Oct 2022 11:22:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=62 --- jetty-minimal.changes | 6 ++++++ jetty-minimal.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 19a243e..98e80ba 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 13 11:21:47 UTC 2022 - Fridrich Strba + +- Force building with java 11 on ix86 in order to avoid random + build failures + ------------------------------------------------------------------- Fri Jul 8 15:15:05 UTC 2022 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index bcdd4b2..e50631b 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -46,9 +46,11 @@ BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.slf4j:slf4j-api) +%ifarch %{ix86} BuildConflicts: java >= 12 BuildConflicts: java-devel >= 12 BuildConflicts: java-headless >= 12 +%endif BuildArch: noarch %description