[eclipse-emf/eclipse-luna: 1/3] Bootstrap into SCL

[Mat Booth]

commit 8f7588322482b79d8533283a37ac168cf618781a
Author: Mat Booth <mat.booth at redhat.com>
Date:   Mon Sep 8 14:41:55 2014 +0100

    Bootstrap into SCL

 eclipse-emf.spec |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index a85bf3a..74789c8 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -13,7 +13,7 @@
 
 Name:      %{?scl_prefix}eclipse-emf
 Version:   2.10.0
-Release:   1%{?dist}
+Release:   1.1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plug-in
 License:   EPL
 URL:       https://projects.eclipse.org/projects/modeling.emf.emf
@@ -30,10 +30,10 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.4.0
+BuildRequires:    eclipse-pde >= 1:4.3.0
 BuildRequires:    dos2unix
 Requires:         jpackage-utils
-Requires:         %{?scl_prefix}eclipse-platform >= 1:4.4.0
+Requires:         eclipse-platform >= 1:4.3.0
 Requires:         %{name}-core
 
 # the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402)
@@ -60,7 +60,7 @@ The core of Eclipse Modeling Framework (EMF) plug-in.
 
 %package   sdk
 Summary:   Eclipse EMF SDK
-Requires:  %{?scl_prefix}eclipse-pde >= 1:4.4.0
+Requires:  eclipse-pde >= 1:4.3.0
 Requires:  %{name} = %{version}-%{release}
 
 %description sdk
@@ -102,30 +102,30 @@ ln -s %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license-feature \
 # (i.e. we don't have to know when upstream adds a new plugin)
 
 # build core features
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
 
 # build emf features - order is important
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
 
 # build examples features
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
 
 %install
 install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -192,6 +192,9 @@ popd
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Wed Jul 09 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-1.1
+- Bootstrap into SCL
+
 * Wed Jun 25 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-1
 - Update to latest upstream release
 - Fix obsoletes on emf-core package, rhbz #1095431