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"/>
-
-
--
--
--
--
--
--
--
--
-
-
--
--
--
--
--
--
--
--
--
--
-
-
--
--
--
--
-
-
--
--
--
--
-
-
--
--
--
--
--
--
--
--
--
--
-
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" "" 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