[eclipse-emf] Move emf.edit to eclipse-emf-core

[Krzysztof Daniel]

commit bc904fbcf4d04c98cf094d09ea2068feaab1521d
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Aug 13 13:27:45 2012 +0200

    Move emf.edit to eclipse-emf-core

 eclipse-emf.spec |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index e7f429e..e112d3b 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -5,7 +5,7 @@
 
 Name:      eclipse-emf
 Version:   2.8.0
-Release:   12%{?dist}
+Release:   13%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -40,11 +40,11 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:4.2.0-0.4
+BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    dos2unix
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:4.2.0-6
+Requires:         eclipse-platform >= 1:4.2.0
 Requires:         %{name}-core
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
@@ -202,8 +202,9 @@ install -d -m 755 %{buildroot}/usr/share/java/emf
 
 unzip -q -n -d %{buildroot}/usr/share/java/emf          build/rpmBuild/org.eclipse.emf.common.zip
 unzip -q -n -d %{buildroot}/usr/share/java/emf          build/rpmBuild/org.eclipse.emf.ecore.zip
- 
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.edit.zip
+unzip -q -n -d %{buildroot}/usr/share/java/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.ui.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.ecore.edit.zip
@@ -245,6 +246,14 @@ rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.eco
 rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.ecore.change_*
 rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
 
+pushd %{buildroot}%{eclipse_dropin}/emf/eclipse/features
+    ln -s /usr/share/java/emf/eclipse/features/org.eclipse.emf.edit_*
+popd
+
+pushd %{buildroot}%{eclipse_dropin}/emf/eclipse/plugins
+    ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.edit_*
+popd
+
 %files
 %defattr(-,root,root,-)
 %{eclipse_dropin}/emf
@@ -272,6 +281,9 @@ rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.eco
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Mon Aug 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-13
+- Move emf.edit to eclipse-emf-core.
+
 * Fri Aug 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-12
 - Lower eclipse-platform version requirement (CBI Eclipse is not in yet).