[eclipse-wtp-jeetools] Update to R3.4.0 Juno stable release

Gerard Ryan galileo at fedoraproject.org
Fri Jul 13 01:01:44 UTC 2012 

commit 72b1bef5c260d0d6ab0e51b8a511a3352a7340a2
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Fri Jul 13 01:56:03 2012 +0100

    Update to R3.4.0 Juno stable release
    
    Some duplicate jars also existed, that were being provided by other
    wtp packages, these have been removed.
    
    The eclipse-wtp-webservices package wasn't providing some of its
    orbital dependencies, so anything that depended on it, also had to
    have a dependency on its orbit dependencies. This has been fixed,
    and all of the extraneous orbit deps and BR/R have been removed.

 .gitignore                                         |    1 +
 eclipse-wtp-jeetools-fix-javax-wsdl-versions.patch |   42 ++++----
 ...-jeetools-fix-jst-enterpriseui-featurexml.patch |    4 +-
 ...eetools-jem.proxy-fix-getTypeClass-method.patch |    4 +-
 ...etools-jst.enterprise_core-fix-featurexml.patch |    4 +-
 ...wtp-jeetools-jst.j2ee.webservice-manifest.patch |    4 +-
 ...tp-jeetools-set-req-org.apache.axis.tools.patch |    4 +-
 eclipse-wtp-jeetools.spec                          |  102 ++++++++-----------
 fetch-eclipse-wtp-jeetools.sh                      |  106 --------------------
 fetch-wtp-jeetools-using-map.sh                    |   49 +++++++++
 sources                                            |    2 +-
 11 files changed, 127 insertions(+), 195 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36c03c0..b95fbdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /eclipse-wtp-jeetools-3.4.0-HEAD-20120618cvs.tar.xz
+/eclipse-wtp-jeetools-3.4.0.tar.xz
diff --git a/eclipse-wtp-jeetools-fix-javax-wsdl-versions.patch b/eclipse-wtp-jeetools-fix-javax-wsdl-versions.patch
index 54fc4d6..492158b 100644
--- a/eclipse-wtp-jeetools-fix-javax-wsdl-versions.patch
+++ b/eclipse-wtp-jeetools-fix-javax-wsdl-versions.patch
@@ -1,6 +1,6 @@
-diff -ur plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 16:30:15.823209280 +0100
-+++ plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 16:31:20.282965499 +0100
+diff -ur org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+--- org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 16:30:15.823209280 +0100
++++ org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 16:31:20.282965499 +0100
 @@ -29,7 +29,7 @@
   org.eclipse.jface;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
   org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
@@ -10,9 +10,9 @@ diff -ur plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF plugins/or
   org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)"
  Eclipse-LazyStart: true
-diff -ur plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.719211286 +0100
-+++ plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.252966078 +0100
+diff -ur org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+--- org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.719211286 +0100
++++ org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.252966078 +0100
 @@ -26,7 +26,7 @@
   org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
@@ -22,9 +22,9 @@ diff -ur plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF plugins
   org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
   org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
-diff -ur plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.398217479 +0100
-+++ plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.197967140 +0100
+diff -ur org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+--- org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.398217479 +0100
++++ org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.197967140 +0100
 @@ -41,7 +41,7 @@
   org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
@@ -34,9 +34,9 @@ diff -ur plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF plu
   org.apache.axis;bundle-version="[1.4.0,1.5.0)",
   org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
   org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-diff -ur plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.773210244 +0100
-+++ plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.272965692 +0100
+diff -ur org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+--- org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.773210244 +0100
++++ org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.272965692 +0100
 @@ -38,7 +38,7 @@
   org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
@@ -46,9 +46,9 @@ diff -ur plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF plugin
   org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
-diff -ur plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF	2012-06-18 16:30:15.721211247 +0100
-+++ plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF	2012-06-18 16:31:20.254966039 +0100
+diff -ur org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+--- org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF	2012-06-18 16:30:15.721211247 +0100
++++ org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF	2012-06-18 16:31:20.254966039 +0100
 @@ -50,7 +50,7 @@
   org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
@@ -58,9 +58,9 @@ diff -ur plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF plugins/org
   org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
   org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
-diff -ur plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.694211769 +0100
-+++ plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.245966213 +0100
+diff -ur org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+--- org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:30:15.694211769 +0100
++++ org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF	2012-06-18 16:31:20.245966213 +0100
 @@ -66,7 +66,7 @@
   org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
@@ -70,9 +70,9 @@ diff -ur plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF plugins/
   org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,2.0.0)",
-diff -ur plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
---- plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF	2012-06-18 17:02:06.926333676 +0100
-+++ plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF	2012-06-18 17:03:55.550237727 +0100
+diff -ur org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+--- org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF	2012-06-18 17:02:06.926333676 +0100
++++ org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF	2012-06-18 17:03:55.550237727 +0100
 @@ -39,7 +39,7 @@
   org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch b/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
index 8fa62b7..6b77f71 100644
--- a/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
+++ b/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
@@ -1,5 +1,5 @@
---- features/org.eclipse.jst.enterprise_ui.feature/feature.xml.orig	2012-06-18 00:54:51.441865454 +0100
-+++ features/org.eclipse.jst.enterprise_ui.feature/feature.xml	2012-06-18 00:55:32.360097407 +0100
+--- org.eclipse.jst.enterprise_ui.feature/feature.xml.orig	2012-06-18 00:54:51.441865454 +0100
++++ org.eclipse.jst.enterprise_ui.feature/feature.xml	2012-06-18 00:55:32.360097407 +0100
 @@ -36,6 +36,20 @@
           unpack="false"/>
  
diff --git a/eclipse-wtp-jeetools-jem.proxy-fix-getTypeClass-method.patch b/eclipse-wtp-jeetools-jem.proxy-fix-getTypeClass-method.patch
index 9d2385d..d958a67 100644
--- a/eclipse-wtp-jeetools-jem.proxy-fix-getTypeClass-method.patch
+++ b/eclipse-wtp-jeetools-jem.proxy-fix-getTypeClass-method.patch
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java.orig	2012-06-10 11:20:40.220606011 +0100
-+++ plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java	2012-06-10 11:20:56.437322023 +0100
+--- org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java.orig	2012-06-10 11:20:40.220606011 +0100
++++ org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java	2012-06-10 11:20:56.437322023 +0100
 @@ -106,21 +106,21 @@
  		if (!nonPrimitiveProxy.isValid())
  			return nonPrimitiveProxy;
diff --git a/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch b/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
index 9eefcf5..bf062f8 100644
--- a/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
+++ b/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
@@ -1,5 +1,5 @@
---- features/org.eclipse.jst.enterprise_core.feature/feature.xml.orig	2012-06-18 04:20:38.614996345 +0100
-+++ features/org.eclipse.jst.enterprise_core.feature/feature.xml	2012-06-18 04:00:33.030410281 +0100
+--- org.eclipse.jst.enterprise_core.feature/feature.xml.orig	2012-06-18 04:20:38.614996345 +0100
++++ org.eclipse.jst.enterprise_core.feature/feature.xml	2012-06-18 04:00:33.030410281 +0100
 @@ -20,7 +20,77 @@
     </license>
  
diff --git a/eclipse-wtp-jeetools-jst.j2ee.webservice-manifest.patch b/eclipse-wtp-jeetools-jst.j2ee.webservice-manifest.patch
index fffa44b..5578685 100644
--- a/eclipse-wtp-jeetools-jst.j2ee.webservice-manifest.patch
+++ b/eclipse-wtp-jeetools-jst.j2ee.webservice-manifest.patch
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF.orig	2012-06-18 00:38:32.000000000 +0100
-+++ plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 04:14:39.309963447 +0100
+--- org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF.orig	2012-06-18 00:38:32.000000000 +0100
++++ org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF	2012-06-18 04:14:39.309963447 +0100
 @@ -27,8 +27,8 @@
   org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
   org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
diff --git a/eclipse-wtp-jeetools-set-req-org.apache.axis.tools.patch b/eclipse-wtp-jeetools-set-req-org.apache.axis.tools.patch
index d316b76..9ba65c0 100644
--- a/eclipse-wtp-jeetools-set-req-org.apache.axis.tools.patch
+++ b/eclipse-wtp-jeetools-set-req-org.apache.axis.tools.patch
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF.orig	2012-06-23 14:25:20.729313672 +0100
-+++ plugins/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF	2012-06-23 14:25:55.121649528 +0100
+--- org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF.orig	2012-06-23 14:25:20.729313672 +0100
++++ org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF	2012-06-23 14:25:55.121649528 +0100
 @@ -19,6 +19,7 @@
   org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
   org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
diff --git a/eclipse-wtp-jeetools.spec b/eclipse-wtp-jeetools.spec
index 8a2188a..6e4a55f 100644
--- a/eclipse-wtp-jeetools.spec
+++ b/eclipse-wtp-jeetools.spec
@@ -1,18 +1,18 @@
-%global	cvstag		20120618cvs
 %global eclipse_base	%{_libdir}/eclipse
 %global	install_loc	%{_datadir}/eclipse/dropins/wtp-jeetools
 
 Name:		eclipse-wtp-jeetools
 Version:	3.4.0
-Release:	0.2.%{cvstag}%{?dist}
+Release:	1%{?dist}
 Summary:	Frameworks and tools focused on development of J2EE artifacts
 
 Group:		Development/Tools
 License:	EPL
 URL:		http://www.eclipse.org/webtools/jee/
 
-Source0:	%{name}-%{version}-HEAD-%{cvstag}.tar.xz
-Source1:	fetch-%{name}.sh
+# Tarball is created using fetch-wtp-jeetools-using-map.sh script
+Source0:	%{name}-%{version}.tar.xz
+Source1:	http://www.eclipse.org/legal/epl-v10.html
 
 Patch0:		%{name}-fix-javax-wsdl-versions.patch
 Patch1:		%{name}-jst.enterprise_core-fix-featurexml.patch
@@ -24,63 +24,47 @@ Patch5:		%{name}-set-req-org.apache.axis.tools.patch
 BuildArch:	noarch
 
 BuildRequires:	ant >= 0:1.8.3-1
-BuildRequires:	jdom >= 0:1.1.3
 BuildRequires:	axis >= 0:1.4-14
-BuildRequires:	log4j >= 0:1.2.17
-BuildRequires:	uddi4j >= 2.0.5-4
-BuildRequires:	wsdl4j >= 0:1.6.2-5
-BuildRequires:	wsil4j >= 1.0-4
-BuildRequires:	javamail >= 1.4.3-11
-BuildRequires:	xerces-j2 >= 2.11.0-7
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
-BuildRequires:	apache-commons-codec >= 1.6-2
-BuildRequires:	apache-commons-logging >= 1.1.1-19
-BuildRequires:	apache-commons-discovery >= 0.5-3
-
-BuildRequires:	eclipse-pde >= 1:4.2.0-0.22
-BuildRequires:	eclipse-rcp >= 1:4.2.0-0.22
-BuildRequires:	eclipse-emf >= 2.8.0-0.7
-BuildRequires:	eclipse-swt >= 1:4.2.0-0.22
-BuildRequires:	eclipse-jdt >= 1:4.2.0-0.22
 BuildRequires:	eclipse-dtp >= 1.10-0.1
-BuildRequires:	eclipse-gef >= 3.8.0-0.3
-BuildRequires:	icu4j-eclipse >= 1:4.4.2.2-11
+BuildRequires:	eclipse-emf >= 2.8.0-0.7
 BuildRequires:	eclipse-emf-core >= 1:2.8.0-0.22
+BuildRequires:	eclipse-gef >= 3.8.0-0.3
+BuildRequires:	eclipse-jdt >= 1:4.2.0-0.22
+BuildRequires:	eclipse-pde >= 1:4.2.0-0.22
 BuildRequires:	eclipse-platform >= 1:4.2.0-0.22
+BuildRequires:	eclipse-rcp >= 1:4.2.0-0.22
+BuildRequires:	eclipse-swt >= 1:4.2.0-0.22
 BuildRequires:	eclipse-wtp-common >= 3.4.0-0.1
 BuildRequires:	eclipse-wtp-servertools >= 3.3.1-4
-BuildRequires:	eclipse-wtp-webservices >= 3.4.0-0.5
 BuildRequires:	eclipse-wtp-sourceediting >= 3.4.0-0.1
+BuildRequires:	eclipse-wtp-webservices >= 3.4.0-0.5
+BuildRequires:	icu4j-eclipse >= 1:4.4.2.2-11
+BuildRequires:	javamail >= 1.4.3-11
+BuildRequires:	java-devel
+BuildRequires:	jdom >= 0:1.1.3
+BuildRequires:	jpackage-utils
+BuildRequires:	wsdl4j >= 0:1.6.2-5
 
-Requires:	eclipse-rcp >= 1:4.2.0-0.22
-Requires:	eclipse-emf >= 2.8.0-0.7
-Requires:	eclipse-swt >= 1:4.2.0-0.22
-Requires:	eclipse-jdt >= 1:4.2.0-0.22
+Requires:	ant >= 0:1.8.3-1
+Requires:	axis >= 0:1.4-14
 Requires:	eclipse-dtp >= 1.10-0.1
-Requires:	eclipse-gef >= 3.8.0-0.3
-Requires:	icu4j-eclipse >= 1:4.4.2.2-11
+Requires:	eclipse-emf >= 2.8.0-0.7
 Requires:	eclipse-emf-core >= 1:2.8.0-0.22
+Requires:	eclipse-gef >= 3.8.0-0.3
+Requires:	eclipse-jdt >= 1:4.2.0-0.22
 Requires:	eclipse-platform >= 1:4.2.0-0.22
+Requires:	eclipse-rcp >= 1:4.2.0-0.22
+Requires:	eclipse-swt >= 1:4.2.0-0.22
 Requires:	eclipse-wtp-common >= 3.4.0-0.1
 Requires:	eclipse-wtp-servertools >= 3.3.1-4
-Requires:	eclipse-wtp-webservices >= 3.4.0-0.5
 Requires:	eclipse-wtp-sourceediting >= 3.4.0-0.1
-
-Requires:	ant >= 0:1.8.3-1
-Requires:	jdom >= 0:1.1.3
-Requires:	axis >= 0:1.4-14
+Requires:	eclipse-wtp-webservices >= 3.4.0-0.5
+Requires:	icu4j-eclipse >= 1:4.4.2.2-11
 Requires:	java
-Requires:	log4j >= 0:1.2.17
-Requires:	uddi4j >= 2.0.5-4
-Requires:	wsdl4j >= 0:1.6.2-5
-Requires:	wsil4j >= 1.0-4
 Requires:	javamail >= 1.4.3-11
-Requires:	xerces-j2 >= 2.11.0-7
+Requires:	jdom >= 0:1.1.3
 Requires:	jpackage-utils
-Requires:	apache-commons-codec >= 1.6-2
-Requires:	apache-commons-logging >= 1.1.1-19
-Requires:	apache-commons-discovery >= 0.5-3
+Requires:	wsdl4j >= 0:1.6.2-5
 
 
 %description
@@ -90,6 +74,7 @@ development of J2EE artifacts.
 
 %prep
 %setup -q
+cp %{SOURCE1} .
 
 find . -type f -name *.jar -exec rm -f {} \;
 find . -type f -name *.class -exec rm -f {} \;
@@ -107,18 +92,7 @@ rm -rf orbit
 mkdir orbit
 pushd orbit
 %{__ln_s} %{_javadir}/jdom.jar
-%{__ln_s} %{_javadir}/log4j.jar
-%{__ln_s} %{_javadir}/uddi4j.jar
-%{__ln_s} %{_javadir}/wsdl4j.jar
-%{__ln_s} %{_javadir}/wsil4j.jar
-%{__ln_s} %{_javadir}/axis/axis.jar
-%{__ln_s} %{_javadir}/axis/saaj.jar
-%{__ln_s} %{_javadir}/axis/jaxrpc.jar
 %{__ln_s} %{_javadir}/javamail/dsn.jar
-%{__ln_s} %{_javadir}/javamail/mail.jar
-%{__ln_s} %{_javadir}/axis/axis-ant.jar
-%{__ln_s} %{_javadir}/apache-commons-logging.jar
-%{__ln_s} %{_javadir}/apache-commons-discovery.jar
 popd
 
 
@@ -135,14 +109,28 @@ install -d -m 755 %{buildroot}%{install_loc}
 %{__unzip} -q -d %{buildroot}%{install_loc} \
 	build/rpmBuild/org.eclipse.jst.enterprise_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_*
+rm -f org.eclipse.wst.command.env.ui_*
+rm -f org.eclipse.wst.web_*
+rm -f org.eclipse.wst.web.ui_*
+popd
+
 
 %files
 %{install_loc}
-%doc features/org.eclipse.jem.feature.patch/license.html
-%doc plugins/org.eclipse.jst.jee/about.html
+%doc epl-v10.html
+%doc org.eclipse.jst.jee/about.html
 
 %changelog
+* Fri Jun 22 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-1
+- Update to R3.4.0 Juno stable release.
+- Remove duplicate jars build by other wtp packages
+- Remove extraneous BR/R that were only needed because of wtp-webservices fault
+
 * Fri Jun 22 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.2.20120618cvs
 - Rename patch files, add versions to BuildRequires/Requires
+
 * Mon Jun 18 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.1.20120618cvs
 - Initial Fedora package
diff --git a/fetch-wtp-jeetools-using-map.sh b/fetch-wtp-jeetools-using-map.sh
new file mode 100755
index 0000000..8cad6eb
--- /dev/null
+++ b/fetch-wtp-jeetools-using-map.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -e
+
+NAME="eclipse-wtp-jeetools"
+VERSION=3.4.0
+TAG=R-3.4.0-20120612174739
+
+echo "Exporting from CVS..."
+mkdir $NAME-$VERSION
+pushd $NAME-$VERSION >/dev/null
+
+MAPFILE=$NAME.map
+TEMPMAPFILE=temp.map
+wget "http://download.eclipse.org/webtools/downloads/drops/R${VERSION}/${TAG}/directory.txt" -O $MAPFILE 
+
+
+dos2unix $MAPFILE
+grep ^[a-z] $MAPFILE | grep -i "jeetools" | grep -v "archives" | grep -v "test" > $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "ejbtools" | grep "org.eclipse.jst" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "webservices" | grep "org.eclipse.jst" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.common.ui" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.jsp.ui.infopop" >> $TEMPMAPFILE
+
+gawk 'BEGIN {
+	FS=","
+}
+{
+if (NF <  4) {
+
+	split($1, version, "=");
+	split(version[1], directory, "@");
+	cvsdir=split($2, dirName, ":");
+	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+}
+else {
+
+	split($1, version, "=");
+	total=split($4, directory, "/");
+	cvsdir=split($2, dirName, ":");
+	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+}
+
+}' $TEMPMAPFILE
+
+rm $TEMPMAPFILE $MAPFILE
+popd >/dev/null
+
+echo "Creating tarball '$NAME-$VERSION.tar.xz'..."
+tar -cJf $NAME-$VERSION.tar.xz $NAME-$VERSION
diff --git a/sources b/sources
index 3d875f8..b24d242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94a9c4060c39be6b8883ef2c272237b8  eclipse-wtp-jeetools-3.4.0-HEAD-20120618cvs.tar.xz
+e01317e1d514fc582936b48466eb551e  eclipse-wtp-jeetools-3.4.0.tar.xz

More information about the scm-commits mailing list