This commit is contained in:
parent
0bca0ea27f
commit
d41c5cee8b
10
scala.spec
10
scala.spec
@ -35,7 +35,7 @@ Release: 0
|
||||
Summary: A hybrid functional/object-oriented language for the JVM
|
||||
License: BSD-3-Clause AND CC0-1.0 AND SUSE-Public-Domain
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://www.scala-lang.org/
|
||||
URL: https://www.scala-lang.org/
|
||||
Source0: %{base_name}-%{version}.tar.xz
|
||||
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'
|
||||
@ -66,12 +66,12 @@ BuildRequires: ant-junit
|
||||
BuildRequires: aqute-bnd
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: java-devel >= 1.7
|
||||
%if %{with bootstrap}
|
||||
BuildConflicts: java-devel >= 9 java-headless >= 9 java >= 9
|
||||
%endif
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: jline >= 2.10
|
||||
BuildRequires: junit
|
||||
BuildConflicts: java >= 9
|
||||
BuildConflicts: java-devel >= 9
|
||||
BuildConflicts: java-headless >= 9
|
||||
Requires: jansi
|
||||
Requires: java-headless >= 1.7
|
||||
# Require full javapackages-tools since scripts use
|
||||
@ -193,7 +193,7 @@ chmod 755 tools/get-scala-*
|
||||
|
||||
%build
|
||||
|
||||
%ant %{do_bootstrap} \
|
||||
%{ant} %{do_bootstrap} \
|
||||
build %{docs_target} || exit 1
|
||||
pushd build/pack/lib
|
||||
mv scala-library.jar scala-library.jar.no
|
||||
|
Loading…
x
Reference in New Issue
Block a user