diff --git a/scala.spec b/scala.spec index def109d..53d0eee 100644 --- a/scala.spec +++ b/scala.spec @@ -1,7 +1,7 @@ # -# spec file for package scala +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,6 +66,7 @@ BuildRequires: ant-junit BuildRequires: aqute-bnd BuildRequires: graphviz BuildRequires: java-devel >= 1.7 +BuildConflicts: java-devel >= 9 java-headless >= 9 java >= 9 BuildRequires: javapackages-local BuildRequires: jline >= 2.10 BuildRequires: junit @@ -190,7 +191,8 @@ chmod 755 tools/get-scala-* %build -export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}" +ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}" +export ANT_OPTS # Add the -verbose flag to scalac on zero architectures. The build # is slow, OBS thinks it is stuck and kills it before it has chance