[eclipse-wtp-jst-web] Add patch to comment org.eclipse.jem.proxy out of jst.web_core feature

[Gerard Ryan]

commit bb5cd46c6358920354d9af12b7358520cad704cf
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Jul 21 16:27:01 2012 +0100

    Add patch to comment org.eclipse.jem.proxy out of jst.web_core feature

 eclipse-wtp-jst-web-jem.proxy.patch |   17 +++++++++++++++++
 eclipse-wtp-jst-web.spec            |    9 +++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-wtp-jst-web-jem.proxy.patch b/eclipse-wtp-jst-web-jem.proxy.patch
new file mode 100644
index 0000000..536175b
--- /dev/null
+++ b/eclipse-wtp-jst-web-jem.proxy.patch
@@ -0,0 +1,17 @@
+--- org.eclipse.jst.web_core.feature/feature.xml.orig	2012-07-21 16:09:58.939860272 +0100
++++ org.eclipse.jst.web_core.feature/feature.xml	2012-07-21 16:10:18.538489147 +0100
+@@ -53,12 +53,12 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
++   <!--<plugin
+          id="org.eclipse.jem.proxy"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
++         unpack="false"/>-->
+ 
+    <plugin
+          id="org.eclipse.jem.workbench"
diff --git a/eclipse-wtp-jst-web.spec b/eclipse-wtp-jst-web.spec
index cda763a..4b64d4c 100644
--- a/eclipse-wtp-jst-web.spec
+++ b/eclipse-wtp-jst-web.spec
@@ -3,7 +3,7 @@
 
 Name:		eclipse-wtp-jst-web
 Version:	3.4.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Tools for working with JavaServer Pages (JSP)
 
 Group:		Development/Tools
@@ -18,6 +18,8 @@ Source0:	%{name}-%{version}.tar.xz
 # These two patches just remove inclusion of features built in webservices
 Patch0:		%{name}-rm-wst.ws_ui-include.patch
 Patch1:		%{name}-rm-wst.ws_core-include.patch
+# Don't build org.eclipse.jem.proxy
+Patch2:		%{name}-jem.proxy.patch
 
 BuildArch:	noarch
 
@@ -78,6 +80,7 @@ popd
 
 %patch0
 %patch1
+%patch2
 
 
 %build
@@ -96,7 +99,6 @@ pushd %{buildroot}%{install_loc}/eclipse/plugins
 rm -f org.eclipse.jem_*.jar
 rm -f org.eclipse.jst.jee_*.jar
 rm -f org.eclipse.jst.j2ee_*.jar
-rm -f org.eclipse.jem.proxy_*.jar
 rm -f org.eclipse.jst.j2ee.web_*.jar
 rm -f org.eclipse.jem.workbench_*.jar
 rm -f org.eclipse.jst.common.ui_*.jar
@@ -114,6 +116,9 @@ popd
 %doc org.eclipse.jst.standard.schemas/about_files/CDDLv1.0.txt
 
 %changelog
+* Thu Jul 15 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-1
+- Add patch to comment org.eclipse.jem.proxy out of jst.web_core feature
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild