This commit is contained in:
parent
859c070397
commit
9e75f27405
@ -1,10 +1,10 @@
|
|||||||
<constraints>
|
<constraints>
|
||||||
<hardware>
|
<hardware>
|
||||||
<physicalmemory>
|
<physicalmemory>
|
||||||
<size unit="G">3</size>
|
<size unit="G">4</size>
|
||||||
</physicalmemory>
|
</physicalmemory>
|
||||||
<disk>
|
<disk>
|
||||||
<size unit="G">3</size>
|
<size unit="G">4</size>
|
||||||
</disk>
|
</disk>
|
||||||
</hardware>
|
</hardware>
|
||||||
</constraints>
|
</constraints>
|
||||||
|
@ -66,7 +66,6 @@ BuildRequires: ant-junit
|
|||||||
BuildRequires: aqute-bnd
|
BuildRequires: aqute-bnd
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: java-devel >= 1.7
|
BuildRequires: java-devel >= 1.7
|
||||||
BuildConflicts: java-devel >= 9 java-headless >= 9 java >= 9
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: jline >= 2.10
|
BuildRequires: jline >= 2.10
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
@ -191,13 +190,7 @@ chmod 755 tools/get-scala-*
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
|
%ant %{do_bootstrap} \
|
||||||
export ANT_OPTS
|
|
||||||
|
|
||||||
# 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
|
|
||||||
# to finish
|
|
||||||
%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