This commit is contained in:
parent
c39ab222e7
commit
a22373cc66
10
scala.spec
10
scala.spec
@ -35,7 +35,7 @@ Release: 0
|
|||||||
Summary: A hybrid functional/object-oriented language for the JVM
|
Summary: A hybrid functional/object-oriented language for the JVM
|
||||||
License: BSD-3-Clause AND CC0-1.0 AND SUSE-Public-Domain
|
License: BSD-3-Clause AND CC0-1.0 AND SUSE-Public-Domain
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
URL: http://www.scala-lang.org/
|
URL: https://www.scala-lang.org/
|
||||||
Source0: %{base_name}-%{version}.tar.xz
|
Source0: %{base_name}-%{version}.tar.xz
|
||||||
Source1: scala-library-2.10.0-bnd.properties
|
Source1: scala-library-2.10.0-bnd.properties
|
||||||
# git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g' -e 's/\s\+.*//g'
|
# git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g' -e 's/\s\+.*//g'
|
||||||
@ -71,9 +71,6 @@ BuildRequires: java-devel >= 1.7
|
|||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: jline >= 2.10
|
BuildRequires: jline >= 2.10
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
%ifarch s390x
|
|
||||||
BuildRequires: java-devel >= 11
|
|
||||||
%endif
|
|
||||||
Requires: jansi
|
Requires: jansi
|
||||||
Requires: java-headless >= 1.7
|
Requires: java-headless >= 1.7
|
||||||
# Require full javapackages-tools since scripts use
|
# Require full javapackages-tools since scripts use
|
||||||
@ -81,6 +78,9 @@ Requires: java-headless >= 1.7
|
|||||||
Requires: javapackages-tools
|
Requires: javapackages-tools
|
||||||
Requires: jline >= 2.10
|
Requires: jline >= 2.10
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
%ifarch s390x
|
||||||
|
BuildRequires: java-devel >= 11
|
||||||
|
%endif
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
Name: %{base_name}-bootstrap
|
Name: %{base_name}-bootstrap
|
||||||
%else
|
%else
|
||||||
@ -200,7 +200,7 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
|
|||||||
# Add the -verbose flag to scalac on zero architectures. The build
|
# 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
|
# is slow, OBS thinks it is stuck and kills it before it has chance
|
||||||
# to finish
|
# to finish
|
||||||
%ant \
|
%{ant} \
|
||||||
build %{docs_target} || exit 1
|
build %{docs_target} || 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user