packages (DEVEL): tomcat/tomcat.spec - webservices subpackage requires any ...

[pawelz]

Author: pawelz                       Date: Tue Aug 18 12:45:32 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- webservices subpackage requires any JSR-109 implementation.

---- Files affected:
packages/tomcat:
   tomcat.spec (1.124.2.13 -> 1.124.2.14) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124.2.13 packages/tomcat/tomcat.spec:1.124.2.14
--- packages/tomcat/tomcat.spec:1.124.2.13	Tue Aug 18 14:39:35 2009
+++ packages/tomcat/tomcat.spec	Tue Aug 18 14:45:27 2009
@@ -50,7 +50,7 @@
 BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
 %if %{with webservices}
 BuildRequires:	java-geronimo-spec-jaxrpc
-BuildRequires:	java-wsdl4j
+BuildRequires:	java(JSR109)
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 0:3.8.1
@@ -69,10 +69,6 @@
 Requires:	java-servletapi = %{epoch}:%{version}-%{release}
 Requires:	javamail >= 1.2
 Requires:	jaxp_parser_impl
-%if %{with webservices}
-Requires:	java-geronimo-spec-jaxrpc
-Requires:	java-wsdl4j
-%endif
 Requires:	jndi >= 1.2.1
 Requires:	jre >= 1.2
 Requires:	rc-scripts
@@ -161,7 +157,7 @@
 Summary:	Web Services support (JSR 109)
 Group:		Libraries/Java
 Requires:	java-geronimo-spec-jaxrpc
-Requires:	java-wsdl4j
+Requires:	java(JSR109)
 
 %description webservices
 Factories for JSR 109 which may be used to resolve web services
@@ -224,7 +220,7 @@
 mkdir -p output/extras/webservices
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
-ln -s %{_javadir}/wsdl4j.jar output/extras/webservices/wsdl4j.jar
+ln -s %{_javadir}/jsr109.jar output/extras/webservices/jsr109.jar
 
 %ant -f extras.xml webservices
 %endif
@@ -293,7 +289,7 @@
 install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
-ln -s %{_javadir}/wsdl4j.jar $TOMCATDIR/lib/wsdl4j.jar
+ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
 %endif
 
 %clean
@@ -397,7 +393,7 @@
 %if %{with webservices}
 %files webservices
 %defattr(644,root,root,755)
-%{_tomcatdir}/lib/wsdl4j.jar
+%{_tomcatdir}/lib/jsr109.jar
 %{_tomcatdir}/lib/jaxrpc.jar
 %{_tomcatdir}/lib/catalina-ws.jar
 %endif
@@ -419,6 +415,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124.2.14  2009/08/18 12:45:27  pawelz
+- webservices subpackage requires any JSR-109 implementation.
+
 Revision 1.124.2.13  2009/08/18 12:39:35  pawelz
 - bcond extras renamed to webservices
 - webservices subpackage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.124.2.13&r2=1.124.2.14&f=u