From 7562c41ed029b95bf7018efd7cdf99447f646d09c62890e0f287aaa5a4dd9115 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Nov 2019 10:57:24 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=29

---
 ....7-jdk11.patch => scala-2.10.7-lines.patch |  0
 scala.changes                                 | 11 +++++-
 scala.spec                                    | 36 +++++++++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)
 rename scala-2.10.7-jdk11.patch => scala-2.10.7-lines.patch (100%)

diff --git a/scala-2.10.7-jdk11.patch b/scala-2.10.7-lines.patch
similarity index 100%
rename from scala-2.10.7-jdk11.patch
rename to scala-2.10.7-lines.patch
diff --git a/scala.changes b/scala.changes
index 726495e..eecec02 100644
--- a/scala.changes
+++ b/scala.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Nov 29 10:53:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Do not package ant tasks in bootstrap build
+- Added patch:
+  * scala-2.10.7-java8compat.patch
+    + Build binaries compatible with java 8 even when building
+      with jdk >= 9
+
 -------------------------------------------------------------------
 Thu Nov 28 14:27:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
@@ -9,7 +18,7 @@ Thu Nov 28 14:27:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * scala-2.10.7-source6.patch
     + Build not only with target level 6, but also with source
       level 6, in order to be able to build with jdk9+
-  * scala-2.10.7-jdk11.patch
+  * scala-2.10.7-lines.patch
     + Fix type conflict with jdk11's java.lang.String.lines
 
 -------------------------------------------------------------------
diff --git a/scala.spec b/scala.spec
index 83deefa..e990a0d 100644
--- a/scala.spec
+++ b/scala.spec
@@ -60,7 +60,7 @@ Patch8:         scala-2.10.4-build_xml.patch
 # removed due to being in object form only, whithout sources
 Patch9:         scala-2.10.6-scaladoc-resources.patch
 Patch10:        scala-2.10.7-source6.patch
-Patch11:        scala-2.10.7-jdk11.patch
+Patch11:        scala-2.10.7-lines.patch
 Patch12:        scala-2.10.7-java8compat.patch
 BuildRequires:  ant
 BuildRequires:  ant-contrib
@@ -93,6 +93,20 @@ 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.
 
+%if %{without bootstrap}
+%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.
+%endif
+
 %package swing
 Summary:        The swing library for the Scala programming languages
 Group:          Development/Libraries/Java
@@ -149,9 +163,11 @@ sed -i '/exec.*pull-binary-libs.sh/d' build.xml
 
 %if %{with bootstrap}
 %global do_bootstrap -DdoBootstrapBuild=yes
+%global docs_target %{nil}
 tar -xzvf %{SOURCE4} --strip-components=1 %{base_name}-%{version}/lib
 %else
 %global do_bootstrap %{nil}
+%global docs_target docs
 %endif
 
 pushd lib
@@ -185,7 +201,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 \
-	build || exit 1
+	build %{docs_target} || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no
 bnd wrap --properties %{SOURCE1} --output scala-library.jar \
@@ -225,8 +241,10 @@ done
 ln -s $(abs2rel %{jline2_jar} %{scaladir}/lib) %{buildroot}%{scaladir}/lib
 ln -s $(abs2rel %{jansi_jar} %{scaladir}/lib) %{buildroot}%{scaladir}/lib
 
+%if %{without bootstrap}
 install -d %{buildroot}%{_sysconfdir}/ant.d
 install -p -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/ant.d/scala
+%endif
 
 install -d %{buildroot}%{_datadir}/mime-info
 install -p -m 644 %{SOURCE21} %{SOURCE22} %{buildroot}%{_datadir}/mime-info/
@@ -236,6 +254,11 @@ install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/mime/packages/
 
 sed -i -e 's,@JAVADIR@,%{_javadir},g' -e 's,@DATADIR@,%{_datadir},g' %{buildroot}%{_bindir}/*
 
+%if %{without bootstrap}
+install -d %{buildroot}%{_mandir}/man1
+install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
+%endif
+
 %files -f .mfiles
 %{_bindir}/*
 %dir %{_datadir}/%{base_name}
@@ -245,15 +268,24 @@ sed -i -e 's,@JAVADIR@,%{_javadir},g' -e 's,@DATADIR@,%{_datadir},g' %{buildroot
 %{_datadir}/mime-info
 %{_datadir}/mime/packages/*
 %license docs/LICENSE
+%if %{without bootstrap}
+%{_mandir}/man1/*
+%endif
 
 %files swing -f .mfiles-swing
 %license docs/LICENSE
 %{_datadir}/%{base_name}/lib/scala-swing.jar
 
+%if %{without bootstrap}
 %files -n ant-%{name}
 # Following is plain config because the ant task classpath could change from
 # release to release
 %config %{_sysconfdir}/ant.d/*
 %license docs/LICENSE
 
+%files apidoc
+%doc build/scaladoc/library/*
+%license docs/LICENSE
+%endif
+
 %changelog