[scala/f18] Fix OSGI dependency issue

[Jochen Schmitt]

commit 2fe290fbb99178bad79ebb0208c33eb483504476
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Nov 25 20:49:05 2012 +0100

    Fix OSGI dependency issue

 scala-library-2.9.2-bnd.properties |    3 +++
 scala.spec                         |   17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/scala-library-2.9.2-bnd.properties b/scala-library-2.9.2-bnd.properties
new file mode 100644
index 0000000..7622266
--- /dev/null
+++ b/scala-library-2.9.2-bnd.properties
@@ -0,0 +1,3 @@
+Bundle-Name: Scala Distribution
+Bundle-SymbolicName: org.scala-ide.scala.library
+Bundle-Version: 2.9.2
\ No newline at end of file
diff --git a/scala.spec b/scala.spec
index 0efdaa5..b54bfc0 100644
--- a/scala.spec
+++ b/scala.spec
@@ -8,7 +8,7 @@
 
 Name:           scala
 Version:        2.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -18,6 +18,7 @@ License:        BSD
 URL:            http://www.scala-lang.org/
 # Source
 Source0:        http://www.scala-lang.org/downloads/distrib/files/scala-sources-%{fullversion}.tgz
+Source1:	scala-library-2.9.2-bnd.properties
 # Change the default classpath (SCALA_HOME)
 Patch1:		scala-2.9.2-tooltemplate.patch
 # Use system jline2 instead of bundled jline2
@@ -42,6 +43,8 @@ BuildRequires:  jline2
 BuildRequires:  jpackage-utils
 # BuildRequires:  maven-ant-tasks
 BuildRequires:  shtool
+BuildRequires:	aqute-bnd
+
 Requires:       java
 Requires:       jline2
 Requires:       jpackage-utils
@@ -121,8 +124,15 @@ popd
 export ANT_OPTS="-Xms1024m -Xmx1024m"
 ant build docs
 
-%install
+pushd build/pack/lib
+cp -p %{SOURCE1} bnd.properties
+java -jar $(build-classpath aqute-bnd) wrap -properties \
+      bnd.properties scala-library.jar
+mv scala-library.jar scala-library.jar.no
+mv scala-library.bar scala-library.jar
+popd
 
+%install
 install -d $RPM_BUILD_ROOT%{_bindir}
 for prog in scaladoc fsc scala scalac scalap; do
         install -p -m 755 build/pack/bin/$prog $RPM_BUILD_ROOT%{_bindir}
@@ -194,6 +204,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc docs/LICENSE
 
 %changelog
+* Sun Nov 25 2012 Jochen Schmitt <Jochen herr-schmitt de> 2.9.2-3
+- Fix OSGI dependency issue
+
 * Sat Nov 24 2012 Jochen Schmitt <Jochen herr-schmitt de> 2.9.2-2
 - Enabel swing module (#879828)