From 218d813b8156bd20b54cd933a3b2cd14fb630550 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 11 Oct 2022 19:00:35 +0000 Subject: [PATCH] Move all java buildrequires to java section hamcrest, junit and slf4j are all java binaries that are pulling in openjdk. The only reason this is building on i686 is because there is an old openjdk tagged into the buildroot. Moving them up to the java section before this bites us. --- hdf.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hdf.spec b/hdf.spec index 0d16a71..48fb199 100644 --- a/hdf.spec +++ b/hdf.spec @@ -39,12 +39,12 @@ BuildRequires: gcc-gfortran, gcc %if %{with java} BuildRequires: java-devel BuildRequires: javapackages-tools -%else -Obsoletes: java-hdf < %{version}-%{release} -%endif BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j +%else +Obsoletes: java-hdf < %{version}-%{release} +%endif BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release}