[eclipse-emf] Try to coexist with Eclipse 4.2 that has emf prebundled.

[Krzysztof Daniel]

commit a0ae88f818a96d11b18908d305f3db27d81d031a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Mar 29 16:18:00 2012 +0200

    Try to coexist with Eclipse 4.2 that has emf prebundled.

 eclipse-emf.spec |   44 +++++++++++++++++++++++---------------------
 1 files changed, 23 insertions(+), 21 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index fdc0b4d..ddb7f39 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -6,7 +6,7 @@
 
 Name:      eclipse-emf
 Version:   2.8.0
-Release:   0.2.postM6%{?dist}
+Release:   0.3.postM6%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -31,11 +31,11 @@ Patch4:    %{name}-no-xsd2ecore.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#%if 0%{?rhel} >= 6
-#ExclusiveArch:    %{ix86} x86_64
-#%else
-#BuildArch:        noarch
-#%endif
+%if 0%{?rhel} >= 6
+ExclusiveArch:    %{ix86} x86_64
+%else
+BuildArch:        noarch
+%endif
 
 # we require 1.6.0 because the javadocs fail to build otherwise
 BuildRequires:    java-devel >= 1:1.6.0
@@ -43,10 +43,12 @@ BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde%{?_isa} >= 1:3.6.1
 BuildRequires:    dos2unix
+BuildRequires:    eclipse-emf-core >= 4.2
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:3.8.0
-Requires:         %{name}-core
+# This is now in main Eclipse package
+#Requires:         %{name}-core
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
 Obsoletes:        %{name}-standalone < 2.4
@@ -66,12 +68,13 @@ produce a set of Java classes for the model, along with a set of adapter
 classes that enable viewing and command-based editing of the model, and a
 basic editor.
 
-%package   core
-Summary:   Eclipse EMF Core
-Group:     System Environment/Libraries
+#%package   core
+#Summary:   Eclipse EMF Core
+#Group:     System Environment/Libraries
+#This package has been moved into main eclispe package
 
-%description core
-The core of Eclipse Modeling Framework
+#%description core
+#The core of Eclipse Modeling Framework
  
 %package   sdk
 Summary:   Eclipse EMF SDK
@@ -157,8 +160,8 @@ ln -s %{_builddir}/emf-%{version}/org.eclipse.xsd.license-feature %{_builddir}/e
 # maintain (i.e. we don't have to know when upstream adds a new plugin)
 
 # build core features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
+#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
+#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
 
 # build emf features - order is important
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.edit -a "$OPTIONS"
@@ -195,8 +198,8 @@ ln -s %{_builddir}/emf-%{version}/org.eclipse.xsd.license-feature %{_builddir}/e
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -n -d %{buildroot}%{_libdir}                     build/rpmBuild/org.eclipse.emf.common.zip
-unzip -q -n -d %{buildroot}%{_libdir}                     build/rpmBuild/org.eclipse.emf.ecore.zip
+#unzip -q -n -d %{buildroot}%{_libdir}                     build/rpmBuild/org.eclipse.emf.common.zip
+#unzip -q -n -d %{buildroot}%{_libdir}                     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}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.common.ui.zip
@@ -240,11 +243,6 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/emf
 %doc org.eclipse.emf.license-feature/rootfiles/*
 
-%files core
-%defattr(-,root,root,-)
-%{eclipse_base}/
-%doc org.eclipse.emf.license-feature/rootfiles/*
-
 %files sdk
 %defattr(-,root,root,-)
 %{eclipse_dropin}/emf-sdk
@@ -263,6 +261,10 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Thu Mar 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.3.postM6
+- Back noarch.
+- Use the eclipse-emf-core from main eclipse-emf.
+
 * Thu Mar 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.2.postM6
 - Removed the noarch tag.