This commit is contained in:
parent
0d61397c9c
commit
465ac563e1
@ -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
|
* The build is long on non-JIT architectures and OBS needs some
|
||||||
compiler output in order to know that the job is not dead;
|
compiler output in order to know that the job is not dead;
|
||||||
otherwise it kills it.
|
otherwise it kills it.
|
||||||
|
- Do not build apidocs to avoid intermittent internal scaladoc
|
||||||
|
errors after hours of build on s390x
|
||||||
- Remove obsolete scriptlets
|
- Remove obsolete scriptlets
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
22
scala.spec
22
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
|
integrates features of object-oriented and functional languages. It
|
||||||
is also interoperable with Java.
|
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
|
%package swing
|
||||||
Summary: The swing library for the Scala programming languages
|
Summary: The swing library for the Scala programming languages
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
@ -170,14 +158,12 @@ sed -i '/exec.*pull-binary-libs.sh/d' build.xml
|
|||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%global do_bootstrap -DdoBootstrapBuild=yes
|
%global do_bootstrap -DdoBootstrapBuild=yes
|
||||||
%global docs_target %{nil}
|
|
||||||
tar -xzvf %{SOURCE2}
|
tar -xzvf %{SOURCE2}
|
||||||
%if %{want_jdk8}
|
%if %{want_jdk8}
|
||||||
tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
|
tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
|
||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
%global do_bootstrap %{nil}
|
%global do_bootstrap %{nil}
|
||||||
%global docs_target docs
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
pushd lib
|
pushd lib
|
||||||
@ -214,7 +200,7 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
|
|||||||
# to finish
|
# to finish
|
||||||
%ant \
|
%ant \
|
||||||
-Dscalac.args=-verbose \
|
-Dscalac.args=-verbose \
|
||||||
build %{docs_target} || exit 1
|
build || exit 1
|
||||||
pushd build/pack/lib
|
pushd build/pack/lib
|
||||||
mv scala-library.jar scala-library.jar.no
|
mv scala-library.jar scala-library.jar.no
|
||||||
bnd wrap --properties %{SOURCE1} --output scala-library.jar \
|
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/*
|
%config %{_sysconfdir}/ant.d/*
|
||||||
%license docs/LICENSE
|
%license docs/LICENSE
|
||||||
|
|
||||||
%if %{without bootstrap}
|
|
||||||
%files apidoc
|
|
||||||
%doc build/scaladoc/library/*
|
|
||||||
%license docs/LICENSE
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user