diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index f712527..9e3d834 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,7 +1,7 @@ # # spec file for package eclipse-jgit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,9 @@ BuildRequires: slf4j BuildRequires: tycho BuildRequires: xml-commons-apis BuildRequires: xmvn-subst +BuildConflicts: java >= 12 +BuildConflicts: java-devel >= 12 +BuildConflicts: java-headless >= 12 #!BuildIgnore: eclipse-platform #!BuildIgnore: tycho-bootstrap #!BuildRequires: eclipse-emf-core eclipse-ecf-core diff --git a/jgit.spec b/jgit.spec index 3d19f75..2e1f75a 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,7 +1,7 @@ # # spec file for package jgit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -68,6 +68,9 @@ BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.tukaani:xz) +BuildConflicts: java >= 12 +BuildConflicts: java-devel >= 12 +BuildConflicts: java-headless >= 12 Obsoletes: %{name}-bootstrap BuildArch: noarch