[eclipse-emf] Update to latest upstream release

[Mat Booth]

commit 1df0664a51c69b0043700a01e9ac4c2771d5ef21
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Jun 25 13:27:23 2014 +0100

    Update to latest upstream release
    
    - Fix obsoletes on emf-core package, rhbz #1095431
    - Move edit plugin from core to main package

 .gitignore       |    3 ++-
 eclipse-emf.spec |   38 ++++++++++++++++++++------------------
 sources          |    2 +-
 3 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a0adcf..cbdc288 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /*.rpm
 /noarch
 /.build-*.log
-/R2_9_2*
+/org.eclipse.emf-*.tar.bz2
+/org.eclipse.emf-*/
 /.project
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 76b4a36..a85bf3a 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -6,19 +6,19 @@
 %endif
 
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global git_tag R2_9_2
-%global context_qualifier v20140203-1126
+%global git_tag R2_10_0
+%global context_qualifier v20140625-1130
 
 %define __requires_exclude osgi*
 
 Name:      %{?scl_prefix}eclipse-emf
-Version:   2.9.2
-Release:   3%{?dist} 
+Version:   2.10.0
+Release:   1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plug-in
 License:   EPL
 URL:       https://projects.eclipse.org/projects/modeling.emf.emf
 
-Source0:   http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/%{git_tag}.tar.bz2
+Source0:   http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{git_tag}.tar.bz2
 
 # look inside correct directory for platform docs
 Patch0:    %{pkg_name}-platform-docs-location.patch
@@ -30,10 +30,10 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.3.2
+BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.4.0
 BuildRequires:    dos2unix
 Requires:         jpackage-utils
-Requires:         %{?scl_prefix}eclipse-platform >= 1:4.3.2
+Requires:         %{?scl_prefix}eclipse-platform >= 1:4.4.0
 Requires:         %{name}-core
 
 # the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402)
@@ -53,14 +53,14 @@ basic editor.
 %package   core
 Epoch:     1
 Summary:   Eclipse EMF Core
-Obsoletes: eclipse-emf-core < 1:2.8.0-20
+Obsoletes: eclipse-emf-core < 1:2.8.2
 
 %description core
 The core of Eclipse Modeling Framework (EMF) plug-in.
- 
+
 %package   sdk
 Summary:   Eclipse EMF SDK
-Requires:  %{?scl_prefix}eclipse-pde >= 1:4.2.0
+Requires:  %{?scl_prefix}eclipse-pde >= 1:4.4.0
 Requires:  %{name} = %{version}-%{release}
 
 %description sdk
@@ -76,7 +76,7 @@ Installable versions of the example projects from the SDKs that demonstrate how
 to use the Eclipse Modeling Framework (EMF) plug-ins.
 
 %prep
-%setup -q -n %{git_tag}
+%setup -q -n org.eclipse.emf-%{git_tag}
 
 find -name *.jar -exec rm -rf {} \;
 find -name *.class -exec rm -rf {} \;
@@ -94,7 +94,8 @@ rm -rf features plugins doc examples
 OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=%{context_qualifier}"
 
 # Work around pdebuild entering/leaving symlink it is unaware of.
-ln -s %{_builddir}/%{git_tag}/org.eclipse.emf.license-feature %{_builddir}/%{git_tag}/org.eclipse.emf.license
+ln -s %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license-feature \
+  %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license
 
 # We build the features seperately, rather than just building the "all"
 # feature, because it makes the files section easier to maintain
@@ -132,10 +133,10 @@ install -d -m 755 %{buildroot}%{_javadir}/emf
 
 unzip -q -n -d %{buildroot}%{_javadir}/emf          build/rpmBuild/org.eclipse.emf.common.zip
 unzip -q -n -d %{buildroot}%{_javadir}/emf          build/rpmBuild/org.eclipse.emf.ecore.zip
-unzip -q -n -d %{buildroot}%{_javadir}/emf          build/rpmBuild/org.eclipse.emf.edit.zip
 
 
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.common.ui.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.edit.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.edit.ui.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.ecore.edit.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.ecore.editor.zip
@@ -171,14 +172,10 @@ pushd %{buildroot}%{_javadir}/emf/eclipse/plugins/
 for f in org.eclipse.emf.common \
 		org.eclipse.emf.ecore.change \
 		org.eclipse.emf.ecore.xmi \
-		org.eclipse.emf.ecore \
-		org.eclipse.emf.edit ; do
+		org.eclipse.emf.ecore ; do
 	mv ${f}_* ${f}.jar
 done
 popd
-pushd %{buildroot}%{eclipse_dropin}/emf/eclipse/plugins
-	ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.edit.jar
-popd
 
 %files
 %{eclipse_dropin}/emf
@@ -195,6 +192,11 @@ popd
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* 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
+- Move edit plugin from core to main package
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 571f20b..52aadc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a5d5e71eb6bc1fd1f751ca9fbd2713e  R2_9_2.tar.bz2
+8d5822598a5d8e57df4ccc634d8aa1e2  org.eclipse.emf-R2_10_0.tar.bz2