[scala] Add fix for using aQuate-bnd from system

[Jochen Schmitt]

commit 42b24271922204b16fa3bcc62da580f295b2e7ed
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Jan 7 22:22:49 2013 +0100

    Add fix for using aQuate-bnd from system

 scala-2.10.0-bnd.patch |   12 ++++++++++++
 scala.spec             |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/scala-2.10.0-bnd.patch b/scala-2.10.0-bnd.patch
new file mode 100644
index 0000000..2cf4a04
--- /dev/null
+++ b/scala-2.10.0-bnd.patch
@@ -0,0 +1,12 @@
+diff -up scala-2.10.0-sources/build.xml.bndx scala-2.10.0-sources/build.xml
+--- scala-2.10.0-sources/build.xml.bndx	2013-01-07 22:11:58.642144310 +0100
++++ scala-2.10.0-sources/build.xml	2013-01-07 22:15:24.546161818 +0100
+@@ -297,7 +297,7 @@ INITIALISATION
+       <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
+     </artifact:dependencies>
+     <!-- BND support -->
+-    <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
++    <typedef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/aquate-bnd.jar" />
+     <property name="init.maven.tasks.finished" value="true" />
+   </target>
+ 
diff --git a/scala.spec b/scala.spec
index 23b015f..374d772 100644
--- a/scala.spec
+++ b/scala.spec
@@ -28,7 +28,9 @@ Patch2:	        scala-2.10.0-use_system_jline.patch
 Patch3:	        scala-2.10.0-compiler-pom.patch
 # Patch Swing module for JDK 1.7
 Patch4:	        scala-2.10.0-java7.patch
-
+# Fix aQuate issue
+Patch5          scala-2.10.0-bnd.patch
+ 
 Source21:       scala.keys
 Source22:       scala.mime
 Source23:       scala-mime-info.xml
@@ -96,6 +98,7 @@ the Scala programming language
 %patch2 -p1 -b .sysjline
 # %patch3 -p0 -b .compiler-pom
 %patch4 -p1 -b .jdk7
+%patch5 -p1 -b .bndx
 
 pushd src
 rm -rf jline
@@ -217,6 +220,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %changelog
 * Mon Jan  7 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.10.0-1
 - New upstream release
+- Add patch to use system aQuate-bnd.jar file
 
 * Thu Dec 13 2012 Jochen Schmitt <s4504kr at omega.in.herr-schmitt.de> - 2.10.0-0.5
 - New upstream release