Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210.

The launcher was not built properly because Equinox Launcher build
script had no support for arm architectures, therefore it did not knew
where to copy the binary.

javax.xml is provided by the VM so there is no need to bundle it. Due to
inconsistencies in packaging, some errors appear (see RHBZ #710815).
This is removal in a first place (eclipse-dtp and eclipse-mylyn updates
will follow).

Additionally, the binary class was not copied properly into the
compatibility bundle. We can't build it properly (because it was some
old, unknown version), but we can build current version and hope for the
best.

eclipse-fix-compatibility-class.patch

@@ -1,10 +1,16 @@
 --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak	2012-07-25 17:28:30.000000000 +0200
 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml	2012-07-30 15:48:17.936540760 +0200
-@@ -23,4 +23,58 @@
+@@ -23,4 +23,64 @@
    <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
    <version>3.5.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
-+  
++  <build>
++    <resources>
++      <resource>
++        <directory>classes</directory>
++      </resource>
++    </resources>
++  </build>  
 +  <profiles>
 +  <profile>
 +    <activation>
@@ -20,7 +26,7 @@
 +            <executions>
 +              <execution>
 +                <id>natives</id>
-+                <phase>process-resources</phase>
++                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
 +                    <copy todir="classes/org/eclipse/core/runtime" file="../org.eclipse.core.runtime/target/classes/org/eclipse/core/runtime/IPluginDescriptor.class"/>

eclipse-remove-javaxxml.patch

@@ -0,0 +1,17 @@
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.bak	2012-11-16 09:38:30.000000000 +0100
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2012-11-16 11:42:36.862299527 +0100
+@@ -158,12 +158,12 @@
+          version="1.6.0.qualifier"
+          unpack="false"/>
+ 
+-   <plugin
++   <!--plugin
+          id="javax.xml"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
++         unpack="false"/-->
+ 
+    <plugin
+          id="org.eclipse.e4.core.di.extensions"

eclipse-secondary-arches.patch

@@ -429,3 +429,27 @@
      <profile>
        <id>build-native-launchers-win32.win32.x86_64</id>
        <activation>
+--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak	2012-11-20 07:45:12.580081610 -0500
++++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh	2012-11-20 07:49:33.792018170 -0500
+@@ -94,6 +94,21 @@
+ 				defaultJava=DEFAULT_JAVA_EXEC
+ 				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ 				;;
++			"armv7l")
++				defaultOSArch="arm"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
++			"armv7hl")
++				defaultOSArch="arm"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
++			"armv5tel")
++				defaultOSArch="arm"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
+ 			*)
+ 				echo "*** Unknown MODEL <${MODEL}>"
+ 				;;

eclipse.spec

@@ -65,7 +65,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -199,6 +199,8 @@ Patch36:        %{name}-improve-core-net-makefile.patch
 
 Patch37:        %{name}-debug-symbols.patch
 
+Patch38:        eclipse-remove-javaxxml.patch
+
 BuildRequires: ant >= 1.8.3
 BuildRequires: rsync
 BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -423,6 +425,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch35
 %patch36
 %patch37
+%patch38
 
 #p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
 #http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
@@ -616,7 +619,7 @@ pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
     ant build_eclipse_cbi
 popd 
 
-mvn-rpmbuild -o clean install \
+mvn-rpmbuild clean install \
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
    -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1))
 
@@ -652,7 +655,6 @@ pushd plugins
 %_symlink javax.inject_ atinject.jar
 %_symlink javax.servlet_ tomcat-servlet-api.jar
 %_symlink javax.servlet.jsp_ glassfish-jsp-api.jar
-%_symlink javax.xml_ xml-commons-apis.jar
 %_symlink org.apache.batik.css_ batik/batik-css.jar
 %_symlink org.apache.batik.util_ batik/batik-util.jar
 %_symlink org.apache.batik.util.gui_ batik/batik-gui-util.jar
@@ -1111,7 +1113,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
 %{_libdir}/%{name}/plugins/javax.el_*
 %{_libdir}/%{name}/plugins/javax.inject_*.jar
-%{_libdir}/%{name}/plugins/javax.xml_1.3.4.*.jar
 %{_libdir}/%{name}/plugins/org.apache.ant_*
 %{_libdir}/%{name}/plugins/org.apache.batik.css_*
 %{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
@@ -1330,6 +1331,11 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Thu Nov 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-18
+- Get rid off javax.xml.
+- Fix building launcher on arm.
+- Fix RHBZ #878210
+
 * Mon Nov 12 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-17
 - Don't package non-existing fragments on s390, s390x.
 - Add BR to GConf-2-devel