[eclipse-wtp-webservices] Remove duplicate jars; Add min. versions for deps
Gerard Ryan
galileo at fedoraproject.org
Wed Jun 27 15:40:35 UTC 2012
commit 9019b6dfaeeb127377c1ad4033ef1d9f72c9818e
Author: Gerard Ryan <gerard at ryan.lt>
Date: Wed Jun 27 16:38:25 2012 +0100
Remove duplicate jars; Add min. versions for deps
eclipse-wtp-webservices.spec | 196 ++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 123 deletions(-)
---
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
index a9ef77a..30df0e3 100644
--- a/eclipse-wtp-webservices.spec
+++ b/eclipse-wtp-webservices.spec
@@ -3,14 +3,9 @@
%global eclipse_dropins %{_datadir}/eclipse/dropins
%global install_loc %{eclipse_dropins}/wtp-webservices
-#location of symlinked plugins from eclipse-wtp-common
-%global common_plugins %{eclipse_dropins}/eclipse-wtp-common/eclipse/plugins
-#location of symlinked plugins from eclipse-wtp-sourceediting
-%global se_plugins %{eclipse_dropins}/wtp-sourceediting/eclipse/plugins
-
Name: eclipse-wtp-webservices
Version: 3.4.0
-Release: 0.5.%{cvstag}%{?dist}
+Release: 0.6.%{cvstag}%{?dist}
Summary: Tools for developing and interacting with Java Web services
Group: Development/Tools
@@ -19,108 +14,95 @@ URL: http://www.eclipse.org/webtools/ws/
# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r HEAD webservices
# pushd webservices
-# cp -r archive/thirdparty/org.apache.axis/ plugins/
# rm -r archive/ tests/
# popd
-# tar -cJf eclipse-wtp-webservices-HEAD-20120602cvs.tar.xz webservices
+# tar -cJf eclipse-wtp-webservices-HEAD-20120617cvs.tar.xz webservices
Source0: %{name}-HEAD-%{cvstag}.tar.xz
-# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r v1_4_0 org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF
-# mv org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF axis-MANIFEST.MF
-# chmod 0644 axis-MANIFEST.MF
-Source1: axis-MANIFEST.MF
-
# build fails looking for old versions of javax.wsdl
-Patch0: webservices-fix-javax.wsdl-version-in-manifests.patch
-Patch1: webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
+Patch0: %{name}-fix-javax.wsdl-version-in-manifests.patch
+Patch1: %{name}-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
# fix order of plugins in feature.xml so they build in correct order
# rm javax.activation & org.apache.wsil4j (orbit) from list
-Patch2: webservices-fix-wst.ws_core-featurexml.patch
+Patch2: %{name}-fix-wst.ws_core-noaxis.patch
# Add unimplemented methods for javax.wsdl
-Patch3: webservices-wsdl-unimplemented-methods.patch
+Patch3: %{name}-wsdl-unimplemented-methods.patch
# fix to work with fedora packaged xerces-j2 (more up-to-date)
-Patch4: webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
-
-BuildArch: noarch
-
-BuildRequires: ant
-BuildRequires: axis
-BuildRequires: log4j
-BuildRequires: uddi4j
-BuildRequires: wsdl4j
-BuildRequires: wsil4j
-BuildRequires: javamail
-BuildRequires: xerces-j2
+Patch4: %{name}-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
+
+# fails to find our version of javax.xml.soap, if version specified
+Patch5: %{name}-rm-javaxxmlsoap-version-check.patch
+
+BuildArch: noarch
+
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: apache-commons-codec
-BuildRequires: geronimo-osgi-support
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-discovery
-
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-rcp
-BuildRequires: eclipse-gef
-BuildRequires: eclipse-swt
-BuildRequires: icu4j-eclipse
-BuildRequires: eclipse-emf-xsd
-BuildRequires: eclipse-emf-core
-BuildRequires: eclipse-platform
-BuildRequires: eclipse-wtp-common
-BuildRequires: eclipse-wtp-servertools
-BuildRequires: eclipse-wtp-sourceediting
-
-Requires: ant
-Requires: axis
+
+BuildRequires: ant >= 0:1.8.3-1
+BuildRequires: apache-commons-codec >= 1.6-2
+BuildRequires: apache-commons-discovery >= 0.5-3
+BuildRequires: apache-commons-logging >= 1.1.1-1
+BuildRequires: axis >= 0:1.4-16
+BuildRequires: geronimo-osgi-support >= 1.0
+BuildRequires: javamail >= 1.4.3-11
+BuildRequires: log4j >= 1.2.17-2
+BuildRequires: uddi4j >= 2.0.5-4
+BuildRequires: wsdl4j >= 0:1.6.2-5
+BuildRequires: wsil4j >= 1.0
+BuildRequires: xerces-j2 >= 2.11.0-7
+
+BuildRequires: eclipse-emf-core >= 2.8.0-0.22
+BuildRequires: eclipse-emf-xsd >= 2.8.0-0.7
+BuildRequires: eclipse-gef >= 3.8.0-0.3
+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-sourceediting >= 3.4.0-0.1
+BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
+
Requires: java
-Requires: log4j
-Requires: uddi4j
-Requires: wsdl4j
-Requires: wsil4j
-Requires: javamail
-Requires: xerces-j2
Requires: jpackage-utils
-Requires: apache-commons-codec
+
+Requires: ant >= 0:1.8.3-1
+Requires: apache-commons-codec >= 1.6-2
+Requires: apache-commons-logging >= 0.5-3
+Requires: apache-commons-discovery >= 1.1.1-1
+Requires: axis >= 0:1.4-16
Requires: geronimo-osgi-support
-Requires: apache-commons-logging
-Requires: apache-commons-discovery
-
-Requires: eclipse-rcp
-Requires: eclipse-gef
-Requires: eclipse-swt
-Requires: icu4j-eclipse
-Requires: eclipse-emf-xsd
-Requires: eclipse-emf-core
-Requires: eclipse-platform
-Requires: eclipse-wtp-common
-Requires: eclipse-wtp-servertools
-Requires: eclipse-wtp-sourceediting
+Requires: javamail >= 1.4.3-11
+Requires: log4j >= 1.2.17-2
+Requires: uddi4j >= 2.0.5-4
+Requires: wsdl4j >= 0:1.6.2-5
+Requires: wsil4j >= 1.0
+Requires: xerces-j2 >= 2.11.0-7
+
+Requires: eclipse-emf-core >= 2.8.0-0.22
+Requires: eclipse-emf-xsd >= 2.8.0-0.7
+Requires: eclipse-gef >= 3.8.0-0.3
+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-sourceediting >= 3.4.0-0.1
+Requires: icu4j-eclipse >= 1:4.4.2.2-11
%description
The JST Web services component contains tools for developing and interacting
with Java Web services.
-Currently, this package only contains the org.eclipse.wst.ws_core feature.
%prep
%setup -q -n webservices
-find . -type f -name *.jar -exec rm -f {} \;
-find . -type f -name *.class -exec rm -f {} \;
-
-# Stuff for org.apache.axis plugin
-# fix manifest
-cp %{SOURCE1} plugins/org.apache.axis/META-INF/MANIFEST.MF
-# link previously nested jars to existing fedora jars
-pushd plugins/org.apache.axis/lib/
-build-jar-repository -s -p . axis/axis
-build-jar-repository -s -p . axis/axis-ant
-mv axis_axis.jar axis.jar
-mv axis_axis-ant.jar axis-ant.jar
-popd
+find . -type f -name *.jar -delete
+find . -type f -name *.class -delete
#Orbit links
rm -rf orbit
@@ -130,9 +112,10 @@ pushd orbit
%{__ln_s} %{_javadir}/uddi4j.jar
%{__ln_s} %{_javadir}/wsdl4j.jar
%{__ln_s} %{_javadir}/wsil4j.jar
-#%{__ln_s} %{_javadir}/axis/axis.jar - add this again if it's OSGi gets fixed
+%{__ln_s} %{_javadir}/axis/axis.jar
%{__ln_s} %{_javadir}/axis/saaj.jar
%{__ln_s} %{_javadir}/axis/jaxrpc.jar
+%{__ln_s} %{_javadir}/axis/axis-ant.jar
%{__ln_s} %{_javadir}/javamail/mail.jar
%{__ln_s} %{_javadir}/apache-commons-codec.jar
%{__ln_s} %{_javadir}/apache-commons-logging.jar
@@ -144,13 +127,14 @@ popd
%patch2
%patch3 -p1
%patch4 -p1
+%patch5
%build
%{_bindir}/eclipse-pdebuild \
-f org.eclipse.wst.ws_ui.feature \
-d "xsd eclipse-wtp-common wtp-sourceediting emf gef \
- org.eclipse.jst.server_ui.feature jem" \
+ org.eclipse.jst.server_ui.feature jem" \
-o `pwd`/orbit
%install
@@ -201,24 +185,6 @@ 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
-%{__ln_s} %{common_plugins}/org.eclipse.jem.util_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.ui_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.emf_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.validation_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.core_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.validation.ui_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.infopop_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.internet.cache_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.snippets_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.frameworks_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.modulecore_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.uriresolver_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.environment_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.validation.infopop_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.modulecore.ui_*.jar
-%{__ln_s} %{common_plugins}/org.eclipse.wst.common.frameworks.ui_*.jar
-%{__ln_s} %{common_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
@@ -241,27 +207,6 @@ 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
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xsd.ui_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.ui_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.ui_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.ui_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.core_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xsd.core_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.core_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.core_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.validation_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.doc.user_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.validation.ui_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.ui.infopop_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.ui.infopop_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.ui.infopop_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.internet.cache_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.standard.schemas_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.validation.infopop_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xmleditor.doc.user_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.xsdeditor.doc.user_*.jar
-%{__ln_s} %{se_plugins}/org.eclipse.wst.dtdeditor.doc.user_*.jar
-
popd
%files
@@ -270,6 +215,11 @@ popd
%doc features/org.eclipse.wst.ws_wsdl14.feature/license.html
%changelog
+* Wed Jun 27 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.6.20120617cvs
+- Remove duplicate jars from other plugins
+- remove org.apache.axis clunky bundle, now that axis is fixed
+- add min. versions for dependencies; make patch names consistent
+
* Sat Jun 16 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.5.20120617cvs
- Remove additional duplicate jars and recreate their symlinks
- Add eclipse-swt and geronimo-osgi-support as dependencies
More information about the scm-commits
mailing list