[eclipse-emf] - Fix RHBZ #716165 using old patches. - Fix ContentHandler casting issue.

[Roland Grunberg]

commit 83db24da9de7d40e366577619af24da55637900c
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Wed Sep 14 16:56:41 2011 -0400

    - Fix RHBZ #716165 using old patches.
    - Fix ContentHandler casting issue.

 eclipse-emf-build-docs.patch          |   20 ++++++++++++++++++++
 eclipse-emf-fix-content-handler.patch |   11 +++++++++++
 eclipse-emf-no-xsd2ecore.patch        |   11 +++++++++++
 eclipse-emf.spec                      |   15 ++++++++++++++-
 4 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-emf-build-docs.patch b/eclipse-emf-build-docs.patch
new file mode 100644
index 0000000..f99ff9e
--- /dev/null
+++ b/eclipse-emf-build-docs.patch
@@ -0,0 +1,20 @@
+--- emf-2.6.0/org.eclipse.emf.sdk-feature/build.properties	2010-06-01 12:00:18.000000000 -0400
++++ emf-2.6.0/org.eclipse.emf.sdk-feature/build.properties.adddocs	2010-08-03 16:30:45.000000000 -0400
+@@ -7,3 +7,4 @@
+                license.html
+ root=rootfiles
+ generate.feature at org.eclipse.emf.source=org.eclipse.emf.sdk, exclude at org.eclipse.emf.doc, exclude at org.eclipse.emf.example.installer, exclude at org.eclipse.emf.mapping.ecore, exclude at org.eclipse.emf.mapping.ecore.editor
++generate.feature at org.eclipse.emf.doc.source=org.eclipse.emf.doc
+--- emf-2.6.0/org.eclipse.xsd.sdk-feature/build.properties	2010-06-01 12:40:35.000000000 -0400
++++ emf-2.6.0/org.eclipse.xsd.sdk-feature/build.properties.build-converter	2010-08-03 17:05:57.845492781 -0400
+@@ -7,3 +7,10 @@
+                license.html
+ root=rootfiles
+ generate.feature at org.eclipse.xsd.source=org.eclipse.xsd.sdk, exclude at org.eclipse.xsd.cheatsheets, exclude at org.eclipse.xsd.doc, exclude at org.eclipse.xsd.ecore.converter, exclude at org.eclipse.xsd.example.installer, exclude at org.eclipse.xsd.mapping, exclude at org.eclipse.xsd.mapping.editor
++generate.feature at org.eclipse.xsd.ecore.converter.source=org.eclipse.xsd.ecore.converter
++generate.feature at org.eclipse.xsd.edit.source=org.eclipse.xsd.edit
++generate.feature at org.eclipse.xsd.editor.source=org.eclipse.xsd.editor
++generate.feature at org.eclipse.xsd.mapping.source=org.eclipse.xsd.mapping
++generate.feature at org.eclipse.xsd.mapping.editor.source=org.eclipse.xsd.mapping.editor
++generate.feature at org.eclipse.xsd.doc.source=org.eclipse.xsd.doc
++individualSourceBundles=true
diff --git a/eclipse-emf-fix-content-handler.patch b/eclipse-emf-fix-content-handler.patch
new file mode 100644
index 0000000..a102b3f
--- /dev/null
+++ b/eclipse-emf-fix-content-handler.patch
@@ -0,0 +1,11 @@
+--- emf-2.6.1/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java.old	2007-09-29 12:41:42.000000000 -0400
++++ emf-2.6.1/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java	2011-09-14 16:25:17.000000000 -0400
+@@ -73,7 +73,7 @@
+           try
+           {
+             @SuppressWarnings("unchecked")
+-            Class<ContentHandler> contributorHandlerClass = Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
++            Class<ContentHandler> contributorHandlerClass = (Class<ContentHandler>) Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
+             Map<String, String> parameters = new HashMap<String, String>();
+             for (IConfigurationElement parameter : element.getChildren("parameter"))
+             {
diff --git a/eclipse-emf-no-xsd2ecore.patch b/eclipse-emf-no-xsd2ecore.patch
new file mode 100644
index 0000000..a7d2372
--- /dev/null
+++ b/eclipse-emf-no-xsd2ecore.patch
@@ -0,0 +1,11 @@
+--- emf-2.6.0/org.eclipse.xsd.sdk-feature/feature.xml	2010-05-27 14:12:20.000000000 -0400
++++ emf-2.6.0/org.eclipse.xsd.sdk-feature/feature.xml.noxsd2ecore	2010-08-04 15:06:18.479696787 -0400
+@@ -30,8 +30,6 @@
+ 
+    <includes id="org.eclipse.xsd" version="0.0.0"/>
+    <includes id="org.eclipse.xsd.source" version="0.0.0"/>
+-   <includes id="org.eclipse.xsd.ecore.converter" version="0.0.0"/>
+-   <includes id="org.eclipse.xsd.ecore.converter.source" version="0.0.0"/>
+    <includes id="org.eclipse.xsd.edit" version="0.0.0"/>
+    <includes id="org.eclipse.xsd.edit.source" version="0.0.0"/>
+    <includes id="org.eclipse.xsd.editor" version="0.0.0"/>
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 6db8096..09f7bea 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-emf
 Version:   2.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -21,6 +21,12 @@ Source1:   get-emf.sh
 Patch1:    %{name}-platform-docs-location.patch
 # bundle examples in example-installer plugins from source in tarball instead of from cvs
 Patch2:    %{name}-bundle-examples.patch
+# Build docs correctly
+Patch3:    %{name}-build-docs.patch
+# Remove xsd2ecore components from SDK, they are not in the main feature
+Patch4:    %{name}-no-xsd2ecore.patch
+# Cast to fix compiler error
+Patch5:    %{name}-fix-content-handler.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +107,9 @@ plugins.
 %setup -q -n emf-%{version}
 %patch1 -p0 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .orig
+%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
 
 rm org.eclipse.emf.doc/tutorials/jet2/jetc-task.jar
 rm org.eclipse.emf.test.core/data/data.jar
@@ -196,6 +205,10 @@ rm -rf %{buildroot}
 %doc org.eclipse.emf.examples-feature/rootfiles/*
 
 %changelog
+* Wed Sep 14 2011 Roland Grunberg <rgrunber at redhat.com> 2.6.1-2
+- Fix RHBZ #716165 using old patches.
+- Fix ContentHandler casting issue.
+
 * Fri Mar 18 2011 Mat Booth <fedora at matbooth.co.uk> 2.6.1-1
 - Update to 2.6.1.