[eclipse-wtp-webservices] Remove duplicate features as well as plugins from other wtp packages

[Gerard Ryan]

commit 17b34edd83c129a17ea2d22379d449bcf513a90b
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Jul 21 14:29:27 2012 +0100

    Remove duplicate features as well as plugins from other wtp packages

 eclipse-wtp-webservices.spec |   89 +++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 39 deletions(-)
---
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
index 089a65b..6789cb1 100644
--- a/eclipse-wtp-webservices.spec
+++ b/eclipse-wtp-webservices.spec
@@ -4,7 +4,7 @@
 
 Name:		eclipse-wtp-webservices
 Version:	3.4.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Tools for developing and interacting with Java Web services
 
 Group:		Development/Tools
@@ -140,7 +140,7 @@ install -d -m 755 %{buildroot}%{install_loc}
 %{__unzip} -q -d %{buildroot}%{install_loc} \
 	   build/rpmBuild/org.eclipse.wst.ws_ui.feature.zip
 
-#Recreate symlinks & remove duplicate jars
+#Recreate symlinks for orbit dependencies
 pushd %{buildroot}%{install_loc}/eclipse/plugins
 rm -f javax.mail_*.jar
 rm -f javax.wsdl_*.jar
@@ -168,47 +168,55 @@ rm -f org.apache.xml.serializer_*.jar
 %{__ln_s} %{_javadir}/xml-commons-apis.jar
 %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
 %{__ln_s} %{_javadir}/xml-commons-resolver.jar
+popd
 
+#remove duplicate features/plugins provided by other wtp packages
+pushd %{buildroot}%{install_loc}/eclipse
 # provided by eclipse-wtp-common
-rm -f org.eclipse.jem.util_*.jar
-rm -f org.eclipse.wst.common.ui_*.jar
-rm -f org.eclipse.wst.common.emf_*.jar
-rm -f org.eclipse.wst.validation_*.jar
-rm -f org.eclipse.wst.common.core_*.jar
-rm -f org.eclipse.wst.validation.ui_*.jar
-rm -f org.eclipse.wst.common.infopop_*.jar
-rm -f org.eclipse.wst.internet.cache_*.jar
-rm -f org.eclipse.wst.common.snippets_*.jar
-rm -f org.eclipse.wst.common.frameworks_*.jar
-rm -f org.eclipse.wst.common.modulecore_*.jar
-rm -f org.eclipse.wst.common.uriresolver_*.jar
-rm -f org.eclipse.wst.common.environment_*.jar
-rm -f org.eclipse.wst.validation.infopop_*.jar
-rm -f org.eclipse.wst.common.modulecore.ui_*.jar
-rm -f org.eclipse.wst.common.frameworks.ui_*.jar
-rm -f org.eclipse.wst.common.emfworkbench.integration_*.jar
+rm -rf features/org.eclipse.wst.common_core.feature_*
+rm -rf features/org.eclipse.wst.common_ui.feature_*
+rm -f plugins/org.eclipse.jem.util_*.jar
+rm -f plugins/org.eclipse.wst.common.ui_*.jar
+rm -f plugins/org.eclipse.wst.common.emf_*.jar
+rm -f plugins/org.eclipse.wst.validation_*.jar
+rm -f plugins/org.eclipse.wst.common.core_*.jar
+rm -f plugins/org.eclipse.wst.validation.ui_*.jar
+rm -f plugins/org.eclipse.wst.common.infopop_*.jar
+rm -f plugins/org.eclipse.wst.internet.cache_*.jar
+rm -f plugins/org.eclipse.wst.common.snippets_*.jar
+rm -f plugins/org.eclipse.wst.common.frameworks_*.jar
+rm -f plugins/org.eclipse.wst.common.modulecore_*.jar
+rm -f plugins/org.eclipse.wst.common.uriresolver_*.jar
+rm -f plugins/org.eclipse.wst.common.environment_*.jar
+rm -f plugins/org.eclipse.wst.validation.infopop_*.jar
+rm -f plugins/org.eclipse.wst.common.modulecore.ui_*.jar
+rm -f plugins/org.eclipse.wst.common.frameworks.ui_*.jar
+rm -f plugins/org.eclipse.wst.common.emfworkbench.integration_*.jar
 
 #provided by eclipse-wtp-sourceediting
-rm -f org.eclipse.wst.xsd.ui_*.jar
-rm -f org.eclipse.wst.dtd.ui_*.jar
-rm -f org.eclipse.wst.sse.ui_*.jar
-rm -f org.eclipse.wst.xml.ui_*.jar
-rm -f org.eclipse.wst.dtd.core_*.jar
-rm -f org.eclipse.wst.xsd.core_*.jar
-rm -f org.eclipse.wst.sse.core_*.jar
-rm -f org.eclipse.wst.xml.core_*.jar
-rm -f org.eclipse.wst.validation_*.jar
-rm -f org.eclipse.wst.sse.doc.user_*.jar
-rm -f org.eclipse.wst.validation.ui_*.jar
-rm -f org.eclipse.wst.sse.ui.infopop_*.jar
-rm -f org.eclipse.wst.xml.ui.infopop_*.jar
-rm -f org.eclipse.wst.dtd.ui.infopop_*.jar
-rm -f org.eclipse.wst.internet.cache_*.jar
-rm -f org.eclipse.wst.standard.schemas_*.jar
-rm -f org.eclipse.wst.validation.infopop_*.jar
-rm -f org.eclipse.wst.xmleditor.doc.user_*.jar
-rm -f org.eclipse.wst.xsdeditor.doc.user_*.jar
-rm -f org.eclipse.wst.dtdeditor.doc.user_*.jar
+rm -rf features/org.eclipse.wst.xml_core.feature_*
+rm -rf features/org.eclipse.wst.xml_ui.feature_*
+rm -rf features/org.eclipse.wst.xml_userdoc.feature_*
+rm -f plugins/org.eclipse.wst.xsd.ui_*.jar
+rm -f plugins/org.eclipse.wst.dtd.ui_*.jar
+rm -f plugins/org.eclipse.wst.sse.ui_*.jar
+rm -f plugins/org.eclipse.wst.xml.ui_*.jar
+rm -f plugins/org.eclipse.wst.dtd.core_*.jar
+rm -f plugins/org.eclipse.wst.xsd.core_*.jar
+rm -f plugins/org.eclipse.wst.sse.core_*.jar
+rm -f plugins/org.eclipse.wst.xml.core_*.jar
+rm -f plugins/org.eclipse.wst.validation_*.jar
+rm -f plugins/org.eclipse.wst.sse.doc.user_*.jar
+rm -f plugins/org.eclipse.wst.validation.ui_*.jar
+rm -f plugins/org.eclipse.wst.sse.ui.infopop_*.jar
+rm -f plugins/org.eclipse.wst.xml.ui.infopop_*.jar
+rm -f plugins/org.eclipse.wst.dtd.ui.infopop_*.jar
+rm -f plugins/org.eclipse.wst.internet.cache_*.jar
+rm -f plugins/org.eclipse.wst.standard.schemas_*.jar
+rm -f plugins/org.eclipse.wst.validation.infopop_*.jar
+rm -f plugins/org.eclipse.wst.xmleditor.doc.user_*.jar
+rm -f plugins/org.eclipse.wst.xsdeditor.doc.user_*.jar
+rm -f plugins/org.eclipse.wst.dtdeditor.doc.user_*.jar
 
 popd
 
@@ -218,6 +226,9 @@ popd
 %doc epl-v10.html
 
 %changelog
+* Sat Jul 21 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-3
+- Remove duplicate features as well as plugins from other wtp packages
+
 * 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