[felix-gogo-command/eclipse-luna] SCL-ise

[Mat Booth]

commit d15d5fb2087bfc39160a93f36d93f5fa5ab44602
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Jul 9 15:17:47 2014 +0100

    SCL-ise

 .gitignore              |    1 +
 felix-gogo-command.spec |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32dcc8b..185ae0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 felix-gogo-command-0.12.0-2.fc15.src.rpm
 /org.apache.felix.gogo.command-0.12.0-project.tar.gz
 /org.apache.felix.gogo.command-0.14.0-project.tar.gz
+/.project
diff --git a/felix-gogo-command.spec b/felix-gogo-command.spec
index 6c8bb25..c4c2940 100644
--- a/felix-gogo-command.spec
+++ b/felix-gogo-command.spec
@@ -5,7 +5,7 @@
 
 Name:           %{?scl_prefix}felix-gogo-command
 Version:        0.14.0
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        Apache Felix Gogo Command
 
 Group:          Development/Libraries
@@ -32,7 +32,7 @@ BuildRequires:  felix-osgi-core
 BuildRequires:  felix-framework
 BuildRequires:  felix-osgi-compendium
 BuildRequires:  %{?scl_prefix}felix-gogo-runtime >= 0.12.0
-BuildRequires:  %{?scl_prefix}felix-gogo-parent
+BuildRequires:  felix-gogo-parent
 BuildRequires:  mvn(org.apache.felix:org.apache.felix.bundlerepository)
 %{?scl:BuildRequires:	  %{?scl_prefix}build}
 
@@ -57,19 +57,31 @@ API documentation for %{pkg_name}.
 %patch0 -p1
 %patch1 -p1
 
+%{?scl:scl enable %{scl} - << "EOF"}
+%mvn_file : %{pkg_name}/%{bundle}
+%{?scl:EOF}
+
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 %mvn_build
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
 %mvn_install
+%{?scl:EOF}
 
 %files -f .mfiles
+%dir %{_javadir}/%{pkg_name}
 %doc LICENSE
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Wed Jul 09 2014 Mat Booth <mat.booth at redhat.com> - 0.14.0-2.1
+- SCL-ise
+
 * Thu Jul 03 2014 Mat Booth <mat.booth at redhat.com> - 0.14.0-2
 - BR/R: gogo-runtime >= 0.12.0