From 0d61397c9c0d7e4ea5ba0a311b594917f44f343a92b376a1316c1af8228e516b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 26 Nov 2019 11:13:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=20

---
 scala.changes | 7 ++++---
 scala.spec    | 6 ------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/scala.changes b/scala.changes
index 822fce9..118069c 100644
--- a/scala.changes
+++ b/scala.changes
@@ -2,9 +2,10 @@
 Tue Nov 26 10:56:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
 - Do not build api documentation in bootstrap flavour
-- Be extra verbose when running with a ZERO VM
-  * The build is long and OBS needs some compiler output in order
-    to know that the job is not dead
+- Be extra verbose for the scalac build
+  * The build is long on non-JIT architectures and OBS needs some
+    compiler output in order to know that the job is not dead; 
+    otherwise it kills it.
 - Remove obsolete scriptlets
 
 -------------------------------------------------------------------
diff --git a/scala.spec b/scala.spec
index ea1b7fc..9f1f9e1 100644
--- a/scala.spec
+++ b/scala.spec
@@ -22,9 +22,6 @@
 %else
 %bcond_with bootstrap
 %endif
-%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-# Sync the list of jit architectures with java-1_8_0-openjdk package
-%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
 %global fullversion %{version}
 %global release_repository http://nexus.scala-tools.org/content/repositories/releases
 %global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots
@@ -216,10 +213,7 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
 # is slow, OBS thinks it is stuck and kills it before it has chance
 # to finish
 %ant \
-%ifarch %{jit_arches}
-%else
 	-Dscalac.args=-verbose \
-%endif
 	build %{docs_target} || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no