From 859c070397199cc19050b04e180da9eb19b5c25960f5ff237558d2b6883a9ef1 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 29 Jul 2021 16:16:18 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=42

---
 scala.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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