[scala] Activate compiler-pom patch again

[Jochen Schmitt]

commit 9763353ba60ee22fb79fdb5bbc1a76b171bb5d34
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Dec 9 18:49:35 2013 +0100

    Activate compiler-pom patch again

 scala-2.10.0-compiler-pom.patch |   13 -------------
 scala-2.10.3-compiler-pom.patch |   15 +++++++++++++++
 scala.spec                      |    9 ++++++---
 3 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/scala-2.10.3-compiler-pom.patch b/scala-2.10.3-compiler-pom.patch
new file mode 100644
index 0000000..fbc0cee
--- /dev/null
+++ b/scala-2.10.3-compiler-pom.patch
@@ -0,0 +1,15 @@
+diff -up scala-2.10.3/src/build/maven/scala-compiler-pom.xml.compiler-pom scala-2.10.3/src/build/maven/scala-compiler-pom.xml
+--- scala-2.10.3/src/build/maven/scala-compiler-pom.xml.compiler-pom	2013-12-09 18:00:10.765090809 +0100
++++ scala-2.10.3/src/build/maven/scala-compiler-pom.xml	2013-12-09 18:02:31.251138135 +0100
+@@ -43,9 +43,9 @@
+ 			<version>@VERSION@</version>
+ 		</dependency>
+     <dependency>
+-      <groupId>org.scala-lang</groupId>
++      <groupId>jline</groupId>
+       <artifactId>jline</artifactId>
+-      <version>@VERSION@</version>
++      <version>2.10</version>
+       <optional>true</optional>
+     </dependency>
+ 	</dependencies>
diff --git a/scala.spec b/scala.spec
index 29e2002..595fd05 100644
--- a/scala.spec
+++ b/scala.spec
@@ -21,7 +21,7 @@
 
 Name:           scala
 Version:        2.10.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -45,7 +45,7 @@ Patch1:		scala-2.10.0-tooltemplate.patch
 # Use system jline2 instead of bundled jline2
 Patch2:	        scala-2.10.3-use_system_jline.patch
 # change org.scala-lang jline in org.sonatype.jline jline
-Patch3:	        scala-2.10.0-compiler-pom.patch
+Patch3:	        scala-2.10.3-compiler-pom.patch
 # Patch Swing module for JDK 1.7
 Patch4:	        scala-2.10.2-java7.patch
 # fix incompatibilities with JLine 2.7
@@ -163,7 +163,7 @@ to create GUI applications in the Scala programming language.
 %setup -q 
 %patch1 -p1 -b .tool
 %patch2 -p1 -b .sysjline
-# %patch3 -p0 -b .compiler-pom
+%patch3 -p1 -b .compiler-pom
 %patch4 -p1 -b .jdk7
 # %patch5 -p1 -b .bndx
 %patch6 -p1 -b .rvk
@@ -362,6 +362,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc docs/LICENSE
 
 %changelog
+* Mon Dec  9 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.10.3-10
+- Activate compiler-pom patch again
+
 * Sun Dec  8 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.10.3-9
 - Put the swing library into a seperate subpackage