OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=23

scala.spec

@@ -29,34 +29,22 @@
 %global jline2_jar %{_javadir}/jline/jline.jar
 %global scaladir %{_datadir}/scala
 %global base_name scala
-%global want_jdk8 1
 %define __requires_exclude .*org\.apache\.ant.*
-Version:        2.10.6
+Version:        2.10.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/
-# ./generate-tarball.sh
-Source0:        %{base_name}-%{version}.tar.gz
+Source0:        %{base_name}-%{version}.tar.xz
 Source1:        scala-library-2.10.0-bnd.properties
-# Bootstrap file generated by ./get-sources.sh
-Source2:        scala-2.10.3-bootstrap.tgz
-# git information generated by ./get-sources.sh
+# git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g' -e 's/\s\+.*//g'
 Source3:        scala.gitinfo
-# we need this binary copy of the scala 2.10.4 compiler
-# for bootstrapping under Java 8; this can be removed if
-# necessary after Scala 2.10.5 is released if it uses 2.10.4
-# for bootstrapping.
-Source4:        http://www.scala-lang.org/files/archive/scala-2.10.4.tgz
-# Remove bundled binaries which are possibly proprietary
-Source5:        generate-tarball.sh
-Source6:        get-source.sh
+Source4:        http://www.scala-lang.org/files/archive/%{base_name}-%{version}.tgz
 Source21:       scala.keys
 Source22:       scala.mime
 Source23:       scala-mime-info.xml
 Source24:       scala.ant.d
-Source31:       scala-bootstript.xml
 # Change the default classpath (SCALA_HOME)
 Patch1:         scala-2.10.0-tooltemplate.patch
 # Use system jline2 instead of bundled jline2
@@ -71,6 +59,8 @@ Patch8:         scala-2.10.4-build_xml.patch
 # Stop scaladoc from trying to bundle non-existent resources that were
 # 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
 BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  ant-junit
@@ -80,7 +70,7 @@ BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  jline >= 2.10
 BuildRequires:  junit
-BuildConflicts: java-devel >= 9
+#BuildConflicts: java-devel >= 9
 Requires:       jansi
 Requires:       java-headless >= 1.7
 # Require full javapackages-tools since scripts use
@@ -143,9 +133,10 @@ the Scala ant tasks.
 %patch3 -p1 -b .compiler-pom
 %patch4 -p1 -b .jdk7
 %patch6 -p1 -b .rvk
-# %patch7 -p1 -b .bc
 %patch8 -p1 -b .bld
 %patch9 -p1 -b .scaladoc
+%patch10 -p1 -b .source6
+%patch11 -p1 -b .jdk11
 
 echo "starr.version=2.10.4\nstarr.use.released=0" > starr.number
 
@@ -158,10 +149,7 @@ sed -i '/exec.*pull-binary-libs.sh/d' build.xml
 
 %if %{with bootstrap}
 %global do_bootstrap -DdoBootstrapBuild=yes
-tar -xzvf %{SOURCE2}
-%if %{want_jdk8}
-tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
-%endif
+tar -xzvf %{SOURCE4} --strip-components=1 %{base_name}-%{version}/lib
 %else
 %global do_bootstrap %{nil}
 %endif
@@ -183,8 +171,6 @@ pushd lib
   popd
 popd
 
-cp -rf %{SOURCE31} .
-
 sed -i -e 's!@JLINE@!%{jline2_jar}!g' build.xml
 
 echo echo $(head -n 1 %{SOURCE3}) > tools/get-scala-commit-sha
@@ -199,7 +185,6 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
 # is slow, OBS thinks it is stuck and kills it before it has chance
 # to finish
 %ant \
-	-Dscalac.args=-verbose \
 	build || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no
@@ -207,27 +192,6 @@ bnd wrap --properties %{SOURCE1} --output scala-library.jar \
     --version "%{version}" scala-library.jar.no
 popd
 
-%check
-
-# these tests fail, but their failures appear spurious
-rm -f test/files/run/parserJavaIdent.scala
-rm -rf test/files/presentation/implicit-member
-rm -rf test/files/presentation/t5708
-rm -rf test/files/presentation/ide-bug-1000349
-rm -rf test/files/presentation/ide-bug-1000475
-rm -rf test/files/presentation/callcc-interpreter
-rm -rf test/files/presentation/ide-bug-1000531
-rm -rf test/files/presentation/visibility
-rm -rf test/files/presentation/ping-pong
-
-rm -f test/osgi/src/ReflectionToolboxTest.scala
-
-# fails under mock but not under rpmbuild
-rm -f test/files/run/t6223.scala
-
-## Most test dependencies still aren't available in Fedora
-# ant test
-
 %install
 
 install -d %{buildroot}%{_bindir}