[scala/f14/master] Nue upstream release_

[Jochen Schmitt]

commit 139e4e58637d9e9722fc20f80eb3163733fd3c3c
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Dec 18 15:34:47 2010 +0100

    Nue upstream release_

 .gitignore                         |    1 +
 scala-2.8.0-fix3716.patch          |   12 ------------
 scala-2.8.0-use_system_jline.patch |   28 ----------------------------
 scala-2.8.1-use_system_jline.patch |   25 +++++++++++++++++++++++++
 scala.spec                         |    9 +++++----
 sources                            |    2 +-
 6 files changed, 32 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3eea87..939a404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ fjbg-r17392.tar.bz2
 msil-2.7.5.final.tar.bz2
 scala-2.7.5.final-sources.tgz
 scala-2.7.7.final-sources.tgz
+/scala-2.8.1.final-sources.tgz
diff --git a/scala-2.8.1-use_system_jline.patch b/scala-2.8.1-use_system_jline.patch
new file mode 100644
index 0000000..27f20bc
--- /dev/null
+++ b/scala-2.8.1-use_system_jline.patch
@@ -0,0 +1,25 @@
+diff -up scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala.systemjline scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala
+--- scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala.systemjline	2010-10-13 22:03:52.000000000 +0200
++++ scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala	2010-12-09 18:59:26.431432002 +0100
+@@ -309,7 +309,8 @@ class Completion(val repl: Interpreter) 
+       else xs.reduceLeft(_ zip _ takeWhile (x => x._1 == x._2) map (_._1) mkString)
+ 
+     // This is jline's entry point for completion.
+-    override def complete(_buf: String, cursor: Int, candidates: JList[String]): Int = {
++    override def complete(_buf: String, cursor: Int, _candidates: JList[_]): Int = {
++      val candidates = _candidates.asInstanceOf[JList[String]]
+       val buf = onull(_buf)
+       verbosity = if (isConsecutiveTabs(buf, cursor)) verbosity + 1 else 0
+       DBG("\ncomplete(%s, %d) last = (%s, %d), verbosity: %s".format(buf, cursor, lastBuf, lastCursor, verbosity))
+diff -up scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala.systemjline scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala
+--- scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala.systemjline	2010-10-13 22:03:52.000000000 +0200
++++ scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala	2010-12-09 18:52:12.258432001 +0100
+@@ -14,7 +14,7 @@ import Properties.userHome
+ /** Primarily, a wrapper for JLine's History.
+  */
+ class History(val jhistory: JHistory) {
+-  def asJavaList = jhistory.getHistoryList
++  def asJavaList = jhistory.getHistoryList.asInstanceOf[java.util.List[String]]
+   def asList: List[String] = asBuffer(asJavaList).toList
+   def index = jhistory.getCurrentIndex
+ 
diff --git a/scala.spec b/scala.spec
index 2e85d06..96b4057 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.8.0
+Version:        2.8.1
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -18,8 +18,7 @@ Source22:       scala.mime
 Source23:       scala-mime-info.xml
 Source24:       scala.ant.d
 
-Patch0:         scala-2.8.0-fix3716.patch
-Patch1:         scala-2.8.0-use_system_jline.patch
+Patch1:         scala-2.8.1-use_system_jline.patch
 Patch2:         scala-2.8.0-tooltemplate.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +80,6 @@ the Scala programming language
 
 %prep
 %setup -q -n scala-%{fullversion}-sources
-%patch0 -p1 -b .fix3716
 %patch1 -p1 -b .systemjline
 %patch2 -p1 -b .tooltemplate
 # remove all jar files except scala-library and scala-compiler needed
@@ -193,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Thu Dec  9 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.8.1-1
+- New upstream release (#661853)
+
 * Sun Aug 15 2010 Geoff Reedy <geoff at programmer-monk.net> - 2.8.0-1
 - Update to upstream 2.8.0 release
 
diff --git a/sources b/sources
index 2d32b2a..7a4227d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09ce2577d1cead7f1797e5b4ac0aa118  scala-2.8.0.final-sources.tgz
+6a6cd9dbbabf74d9d43f69e5328671e9  scala-2.8.1.final-sources.tgz