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

---
 _constraints | 4 ++--
 scala.spec   | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/_constraints b/_constraints
index d0f11ec..9866025 100644
--- a/_constraints
+++ b/_constraints
@@ -1,10 +1,10 @@
 <constraints>
   <hardware>
     <physicalmemory>
-      <size unit="G">3</size>
+      <size unit="G">4</size>
     </physicalmemory>
     <disk>
-      <size unit="G">3</size>
+      <size unit="G">4</size>
     </disk>
   </hardware>
 </constraints> 
diff --git a/scala.spec b/scala.spec
index 53d0eee..419dca8 100644
--- a/scala.spec
+++ b/scala.spec
@@ -66,7 +66,6 @@ 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
@@ -191,13 +190,7 @@ chmod 755 tools/get-scala-*
 
 %build
 
-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
-# to finish
-%ant \
+%ant %{do_bootstrap} \
 	build %{docs_target} || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no