From 39f36cc25b5ef648500a29ef173bf694a1c40825 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 10 Jun 2015 14:26:31 +0100
Subject: [PATCH] Remove irrelevant swt and launcher fragments from rcp feature

---
 disable-non-linux.patch | 231 ----------------------------------------
 eclipse.spec            |   7 ++
 2 files changed, 7 insertions(+), 231 deletions(-)

diff --git a/disable-non-linux.patch b/disable-non-linux.patch
index bd2bd34..7ab8150 100644
--- a/disable-non-linux.patch
+++ b/disable-non-linux.patch
@@ -80,234 +80,3 @@
           id="org.eclipse.equinox.common"
           download-size="0"
           install-size="0"
-@@ -288,46 +278,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.equinox.launcher.gtk.solaris.sparc"
--         os="solaris"
--         ws="gtk"
--         arch="sparc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.gtk.solaris.x86"
--         os="solaris"
--         ws="gtk"
--         arch="x86"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
--         os="macosx"
--         ws="cocoa"
--         arch="x86_64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.gtk.linux.ppc"
--         os="linux"
--         ws="gtk"
--         arch="ppc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
-          id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
-          os="linux"
-          ws="gtk"
-@@ -408,56 +358,6 @@
-          fragment="true"/>
- 
-    <plugin
--         id="org.eclipse.equinox.launcher.gtk.aix.ppc"
--         os="aix"
--         ws="gtk"
--         arch="ppc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.gtk.aix.ppc64"
--         os="aix"
--         ws="gtk"
--         arch="ppc64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.gtk.hpux.ia64"
--         os="hpux"
--         ws="gtk"
--         arch="ia64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.win32.win32.x86"
--         os="win32"
--         ws="win32"
--         arch="x86"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
--         id="org.eclipse.equinox.launcher.win32.win32.x86_64"
--         os="win32"
--         ws="win32"
--         arch="x86_64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"/>
--
--   <plugin
-          id="org.eclipse.swt"
-          download-size="0"
-          install-size="0"
-@@ -465,28 +365,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.swt.win32.win32.x86"
--         os="win32"
--         ws="win32"
--         arch="x86"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.win32.win32.x86_64"
--         os="win32"
--         ws="win32"
--         arch="x86_64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.swt.gtk.linux.x86"
-          os="linux"
-          ws="gtk"
-@@ -520,28 +398,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.swt.gtk.solaris.sparc"
--         os="solaris"
--         ws="gtk"
--         arch="sparc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.gtk.solaris.x86"
--         os="solaris"
--         ws="gtk"
--         arch="x86"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--         
--   <plugin
-          id="org.eclipse.swt.gtk.linux.arm"
-          os="linux"
-          ws="gtk"
-@@ -564,17 +420,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.swt.gtk.linux.ppc"
--         os="linux"
--         ws="gtk"
--         arch="ppc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.swt.gtk.linux.ppc64"
-          os="linux"
-          ws="gtk"
-@@ -604,50 +449,6 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.cocoa.macosx.x86_64"
--         os="macosx"
--         ws="cocoa"
--         arch="x86_64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.gtk.aix.ppc"
--         os="aix"
--         ws="gtk"
--         arch="ppc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.gtk.aix.ppc64"
--         os="aix"
--         ws="gtk"
--         arch="ppc64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.swt.gtk.hpux.ia64"
--         os="hpux"
--         ws="gtk"
--         arch="ia64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
-          fragment="true"
-          unpack="false"/>
- 
diff --git a/eclipse.spec b/eclipse.spec
index d3118cf..17ef7cf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -397,12 +397,19 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b eclipse.platform.swt.binaries
     %pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
+    %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
   fi
 done
 for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
   module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :)
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b rt.equinox.framework
+    if [ -n "$(grep $b eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml)" ] ; then
+      %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+    fi
+    if [ -n "$(grep $b rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml)" ] ; then
+      %pom_xpath_remove "plugin[@id='$b']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
+    fi
   fi
 done
 %pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug