[eclipse-emf] Moving core back to emf package (for CBI build).

[Krzysztof Daniel]

commit 4735310405cc13ccbf6c83208513f452888df562
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Aug 8 09:56:30 2012 +0200

    Moving core back to emf package (for CBI build).

 eclipse-emf.spec |   57 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 8724675..e15b0a1 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -5,7 +5,7 @@
 
 Name:      eclipse-emf
 Version:   2.8.0
-Release:   2%{?dist}
+Release:   10%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -42,11 +42,9 @@ BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0-0.4
 BuildRequires:    dos2unix
-BuildRequires:    eclipse-emf-core >= 2.8.0-1
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.8.0
-# This is now in main Eclipse package
+Requires:         eclipse-platform >= 1:4.2.0-10
 Requires:         %{name}-core
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
@@ -56,6 +54,9 @@ Obsoletes:        %{name}-standalone < 2.4
 Obsoletes:        %{name}-sdo < 2.5
 Obsoletes:        %{name}-sdo-sdk < 2.5
 
+Obsoletes:        eclipse-emf-core < 2.8.0-10
+Conflicts:        eclipse-platform < 4.2.0.10
+
 #TODO: ODA, GWT and RAP components are not packaged.
 #TODO: Possibly spin XSD off into it's own package, upstream have moved it to it's project
 
@@ -67,13 +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
@@ -128,12 +129,6 @@ plugins.
 
 rm org.eclipse.emf.doc/tutorials/jet2/jetc-task.jar
 rm org.eclipse.emf.test.core/data/data.jar
-rm -rf org.eclipse.emf.common
-rm -rf org.eclipse.emf.common-feature
-rm -rf org.eclipse.emf.ecore
-rm -rf org.eclipse.emf.ecore-feature
-rm -rf org.eclipse.emf.ecore.xmi
-rm -rf org.eclipse.emf.ecore.change
 
 # link to local java api javadocs
 sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api/|%{_javadocdir}/java|" -e "s|\${javaHome}/docs/api/|%{_javadocdir}/java|" \
@@ -166,8 +161,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-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-#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
 eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
@@ -203,9 +198,10 @@ eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
 %install
 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
+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}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.common.ui.zip
@@ -241,19 +237,23 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-examples build/rpmBuild/org.ecl
 (cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/features | xargs rm -rf)
 (cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/plugins  && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/plugins  | xargs rm -rf)
 
-# eclipse-emf-core is a part of eclipse package, avoid duplicating plugins and features
-rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/features/org.eclipse.emf.common_*
-rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/plugins/org.eclipse.emf.common_*
-rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/features/org.eclipse.emf.ecore_*
-rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/plugins/org.eclipse.emf.ecore_*
-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_*
+# remove duplicated plugins and features
+rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/features/org.eclipse.emf.common_*
+rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.common_*
+rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/features/org.eclipse.emf.ecore_*
+rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.ecore_*
+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_*
 
 %files
 %defattr(-,root,root,-)
 %{eclipse_dropin}/emf
 %doc org.eclipse.emf.license-feature/rootfiles/*
 
+%files core
+/usr/share/java/emf
+%doc org.eclipse.emf.license-feature/rootfiles/*
+
 %files sdk
 %defattr(-,root,root,-)
 %{eclipse_dropin}/emf-sdk
@@ -272,6 +272,9 @@ rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/plugins/org.eclipse.emf.
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Thu Aug 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-10
+- Moving core back to emf package (for CBI build).
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild