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

[Mat Booth]

commit fb43c6908652ad95dc317071c05c074c4fd879cb
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Jul 9 15:00:05 2014 +0100

    SCL-ise

 .gitignore              |    1 +
 felix-gogo-runtime.spec |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1037a81..abff3c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
 /org.apache.felix.gogo.runtime-0.12.1-project.tar.gz
+/.project
diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index d579c0f..d7492f4 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -6,7 +6,7 @@
 
 Name:           %{?scl_prefix}%{project}-gogo-runtime
 Version:        0.12.1
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Community OSGi R4 Service Platform Implementation - Basic Commands
 License:        ASL 2.0
 URL:            http://felix.apache.org/site/apache-felix-gogo.html
@@ -28,7 +28,7 @@ BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:gogo-parent:pom:)
+BuildRequires:  mvn(org.apache.felix:gogo-parent)
 BuildRequires:  mvn(org.easymock:easymock)
 BuildRequires:  mvn(org.mockito:mockito-all)
 BuildRequires:  mvn(org.osgi:org.osgi.compendium)
@@ -60,15 +60,19 @@ This package contains the API documentation for %{name}.
 %patch3 -p1
 %patch4 -p1
 
-%mvn_file : %{project}/%{name}
+%{?scl:scl enable %{scl} - << "EOF"}
+%mvn_file : %{project}/%{pkg_name}
+%{?scl:EOF}
 
 %build
-%{?scl:%scl_maven_opts}
+%{?scl:scl enable %{scl} - << "EOF"}
 %mvn_build
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
 %mvn_install
-
+%{?scl:EOF}
 
 %files -f .mfiles
 %dir %{_javadir}/%{project}
@@ -78,6 +82,9 @@ This package contains the API documentation for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Jul 09 2014 Mat Booth <mat.booth at redhat.com> - 0.12.1-1.1
+- SCL-ise
+
 * Thu Jul 3 2014 Alexander Kurtakov <akurtako at redhat.com> 0.12.1-1
 - Update to upstream 0.12.1.