[eclipse-wtp-jeetools] Incorporate stuff from eclipse-wtp-jst-web

[Gerard Ryan]

commit 1511fa67bfb1559906824c2e21fea873151197e9
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Thu May 16 08:12:37 2013 +0100

    Incorporate stuff from eclipse-wtp-jst-web

 eclipse-wtp-jeetools.spec |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-wtp-jeetools.spec b/eclipse-wtp-jeetools.spec
index 26774c1..12c70ab 100644
--- a/eclipse-wtp-jeetools.spec
+++ b/eclipse-wtp-jeetools.spec
@@ -17,13 +17,18 @@
 
 Name:		eclipse-wtp-jeetools
 Version:	3.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Frameworks and tools focused on development of J2EE artifacts
 
 Group:		Development/Tools
 License:	EPL
 URL:		http://www.eclipse.org/webtools/jee/
 
+Obsoletes:	eclipse-wtp-jeetools <= 3.4.0-4
+Obsoletes:	eclipse-wtp-jst-web <= 3.4.0-2
+Provides:	eclipse-wtp-jst-web = %{version}
+
+
 # Tarball is created using fetch-wtp-jeetools-using-map.sh script
 Source0:	http://git.eclipse.org/c/jeetools/webtools.javaee.git/snapshot/%{javaee_dir}.tar.bz2
 Source1:	http://git.eclipse.org/c/ejb/webtools.ejb.git/snapshot/%{ejb_dir}.tar.bz2
@@ -40,6 +45,10 @@ Patch4:		%{name}-jst.j2ee.webservice-manifest.patch
 # Update name of apache-commons-discovery jar for copying
 Patch6:		%{name}-copyaxisjarcommand.patch
 
+# These two patches just remove inclusion of features built in webservices
+Patch7:		%{name}-rm-wst.ws_ui-include.patch
+Patch8:		%{name}-rm-wst.ws_core-include.patch
+
 BuildArch:	noarch
 
 BuildRequires:	ant >= 0:1.8.3-1
@@ -129,6 +138,10 @@ rm -r %{common_dir}
 tar xfj %{SOURCE4}
 pushd %{sourceediting_dir}
 cp -r docs/org.eclipse.jst.jsp.ui.infopop ../
+cp -r bundles/org.eclipse.jst.jsp.core ../
+cp -r bundles/org.eclipse.jst.jsp.ui ../
+cp -r bundles/org.eclipse.jst.standard.schemas ../
+cp -r bundles/org.eclipse.wst.jsdt.web.support.jsp ../
 popd
 rm -r %{sourceediting_dir}
 
@@ -142,6 +155,8 @@ find -name MANIFEST.MF -exec sed -i -e \
 pushd %{javaee_dir}/features
 %patch1
 %patch2
+%patch7
+%patch8
 popd
 pushd %{javaee_dir}/plugins
 %patch3
@@ -165,7 +180,12 @@ find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.l
 %build
 %{_bindir}/eclipse-pdebuild -f org.eclipse.jst.enterprise_ui.feature \
 	-d "eclipse-wtp-common wtp-sourceediting dtp-connectivity dtp-modelbase \
-	   org.eclipse.jst.server_ui.feature wtp-webservices xsd gef emf" \
+		org.eclipse.jst.server_ui.feature wtp-webservices xsd gef emf" \
+	-o `pwd`/orbit
+
+%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.web_ui.feature \
+	-d "eclipse-wtp-common wtp-sourceediting dtp-connectivity dtp-modelbase \
+		org.eclipse.jst.server_ui.feature emf" \
 	-o `pwd`/orbit
 
 
@@ -174,6 +194,9 @@ install -d -m 755 %{buildroot}%{install_loc}
 %{__unzip} -q -d %{buildroot}%{install_loc} \
 	build/rpmBuild/org.eclipse.jst.enterprise_ui.feature.zip
 
+%{__unzip} -q -d %{buildroot}%{install_loc} \
+	build/rpmBuild/org.eclipse.jst.web_ui.feature.zip
+
 # remove duplicate jars provided by other wtp packages
 pushd %{buildroot}%{install_loc}/eclipse/plugins
 #rm -f org.eclipse.jst.jsp.ui.infopop_*
@@ -190,6 +213,9 @@ popd
 %doc %{javaee_dir}/plugins/org.eclipse.jst.jee/about.html
 
 %changelog
+* Sun May 12 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-3
+- Provide eclipse-wtp-jst-web so that it can be retired
+
 * Mon May 06 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-2
 - Add missing bundle org.eclipse.jst.servlet.ui
 - Remove unused patch from SRPM