From 465ac563e1567a0f68769163a451c397017eb18d6e03db8cfb325dfd61efbb57 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 27 Nov 2019 05:25:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=21

---
 scala.changes |  2 ++
 scala.spec    | 22 +---------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/scala.changes b/scala.changes
index 118069c..8ec35a5 100644
--- a/scala.changes
+++ b/scala.changes
@@ -6,6 +6,8 @@ Tue Nov 26 10:56:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * 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.
+- Do not build apidocs to avoid intermittent internal scaladoc
+  errors after hours of build on s390x
 - Remove obsolete scriptlets
 
 -------------------------------------------------------------------
diff --git a/scala.spec b/scala.spec
index 9f1f9e1..6537408 100644
--- a/scala.spec
+++ b/scala.spec
@@ -104,18 +104,6 @@ common programming patterns in a concise and type-safe way. It
 integrates features of object-oriented and functional languages. It
 is also interoperable with Java.
 
-%package apidoc
-Summary:        Documentation for the Scala programming language
-Group:          Documentation/HTML
-%if %{without bootstrap}
-Obsoletes:      %{base_name}-bootstrap-apidoc
-%endif
-
-%description apidoc
-Scala is a general purpose programming language for the JVM that blends
-object-oriented and functional programming. This package provides
-reference and API documentation for the Scala programming language.
-
 %package swing
 Summary:        The swing library for the Scala programming languages
 Group:          Development/Libraries/Java
@@ -170,14 +158,12 @@ sed -i '/exec.*pull-binary-libs.sh/d' build.xml
 
 %if %{with bootstrap}
 %global do_bootstrap -DdoBootstrapBuild=yes
-%global docs_target %{nil}
 tar -xzvf %{SOURCE2}
 %if %{want_jdk8}
 tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
 %endif
 %else
 %global do_bootstrap %{nil}
-%global docs_target docs
 %endif
 
 pushd lib
@@ -214,7 +200,7 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
 # to finish
 %ant \
 	-Dscalac.args=-verbose \
-	build %{docs_target} || exit 1
+	build || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no
 bnd wrap --properties %{SOURCE1} --output scala-library.jar \
@@ -314,10 +300,4 @@ install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
 %config %{_sysconfdir}/ant.d/*
 %license docs/LICENSE
 
-%if %{without bootstrap}
-%files apidoc
-%doc build/scaladoc/library/*
-%license docs/LICENSE
-%endif
-
 %changelog