From 68c9115dc74c2c3740f3b0b174e67bbf44513e61 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Jul 27 2012 12:25:09 +0000
Subject: Fix master equinox patch


---

diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch
new file mode 100644
index 0000000..61c01b4
--- /dev/null
+++ b/eclipse-fix-master-equinox.patch
@@ -0,0 +1,235 @@
+--- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-07-27 14:02:59.042494959 +0200
+@@ -7,173 +7,153 @@
+    <includes
+          id="org.eclipse.equinox.sdk"
+          version="0.0.0"/>
+-           
+-    <plugin
++
++   <includes
++         id="org.eclipse.equinox.starterkit.product.feature"
++         version="0.0.0"/>
++
++   <includes
++         id="org.eclipse.pde.build.product.feature"
++         version="0.0.0"/>
++
++   <plugin
+          id="org.eclipse.equinox.supplement"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>                         
+-         
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.equinox.http.registry"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/> 
+-             
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.equinox.http.jetty"
+          download-size="0"
+          install-size="0"
+-         version="0.0.0" 
+-         unpack="false"/> 
+-           
+-    <plugin
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.equinox.http.servlet"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-         
+-    <plugin
+-         id="org.eclipse.equinox.http.servletbridge"         	
++
++   <plugin
++         id="org.eclipse.equinox.http.servletbridge"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-         
+-    <plugin
+-         id="org.eclipse.equinox.servletbridge"         	
++
++   <plugin
++         id="org.eclipse.equinox.servletbridge"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-                                    
+-    <plugin
++
++   <plugin
+          id="javax.servlet"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>        
+-     
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="javax.el"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/> 
+-        
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.apache.commons.logging"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>        
+-   
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.jetty.continuation"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>   
+-    
+-     <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.jetty.http"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>   
+-    
+-     <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.jetty.io"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-    
+-    <plugin
++
++   <plugin
+          id="org.eclipse.jetty.security"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
+-    <plugin
++   <plugin
+          id="org.eclipse.jetty.server"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
+-<plugin
++   <plugin
+          id="org.eclipse.jetty.servlet"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
+-<plugin
++   <plugin
+          id="org.eclipse.jetty.util"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-    
+-    <plugin
++
++   <plugin
+          id="org.apache.felix.gogo.runtime"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>      
+-      
++         unpack="false"/>
++
+    <plugin
+-         id="org.slf4j.api"
++         id="slf4j.api"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>       
+-         
+-    <plugin
++         unpack="false"/>
++
++   <plugin
+          id="org.apache.mina.core"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/> 
+-      
+-    <plugin
+-         id="org.apache.sshd.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+-         
+-     <plugin
+-         id="org.apache.jasper.glassfish"
++
++   <plugin
++         id="sshd-core"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+- 
+- <!-- see bug 368488 and bug 377314           
+- <includes
+-         id="master-equinox-p2"
+-         version="0.0.0"/>        
+- -->         
+- <includes
+-         id="master-equinox-weaving"
+-         version="0.0.0"/>
+-         
+- <includes
+-         id="org.eclipse.equinox.weaving.sdk"
+-         version="0.0.0"/>    
+ 
+- <includes
+-         id="org.eclipse.equinox.starterkit.product.feature"
+-         version="0.0.0"/>      
+-    
+- <includes
+-         id="org.eclipse.pde.build.product.feature"
+-         version="0.0.0"/>
+-                  
+ </feature>
diff --git a/eclipse.spec b/eclipse.spec
index d1369c7..e2a3694 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -68,6 +68,7 @@ Patch6:         %{name}-fix-sshd-id.patch
 Patch7:         %{name}-fix-equinox-ip-imports.patch
 Patch8:         %{name}-remove-weaving.patch
 Patch9:         %{name}-fix-master-ecf.patch
+Patch10:        %{name}-fix-master-equinox.patch
 
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
@@ -252,6 +253,7 @@ developing Eclipse plugins.
 %patch7
 %patch8
 %patch9
+%patch10
 
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .