packages (DEVEL): tomcat/tomcat.spec - bcond extras renamed to webservices ...

[pawelz]

Author: pawelz                       Date: Tue Aug 18 12:39:41 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- bcond extras renamed to webservices
- webservices subpackage

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

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124.2.12 packages/tomcat/tomcat.spec:1.124.2.13
--- packages/tomcat/tomcat.spec:1.124.2.12	Tue Aug 18 13:25:53 2009
+++ packages/tomcat/tomcat.spec	Tue Aug 18 14:39:35 2009
@@ -5,7 +5,7 @@
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
 %bcond_without	java_sun	# build with gcj (does not work)
-%bcond_without	extras		# skip building extras
+%bcond_without	webservices	# skip building webservices
 #
 
 %define		jspapiver	2.1
@@ -48,7 +48,7 @@
 BuildRequires:	java-commons-daemon >= 1.0
 BuildRequires:	java-commons-dbcp >= 0:1.1
 BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
-%if %{with extras}
+%if %{with webservices}
 BuildRequires:	java-geronimo-spec-jaxrpc
 BuildRequires:	java-wsdl4j
 %endif
@@ -69,7 +69,7 @@
 Requires:	java-servletapi = %{epoch}:%{version}-%{release}
 Requires:	javamail >= 1.2
 Requires:	jaxp_parser_impl
-%if %{with extras}
+%if %{with webservices}
 Requires:	java-geronimo-spec-jaxrpc
 Requires:	java-wsdl4j
 %endif
@@ -157,6 +157,16 @@
 %description webapp-examples -l pl.UTF-8
 Przykładowe aplikacje dla Tomcata.
 
+%package webservices
+Summary:	Web Services support (JSR 109)
+Group:		Libraries/Java
+Requires:	java-geronimo-spec-jaxrpc
+Requires:	java-wsdl4j
+
+%description webservices
+Factories for JSR 109 which may be used to resolve web services
+references.
+
 %package jasper
 Summary:	JSP compiler
 Summary(pl.UTF-8):	Kompilator JSP
@@ -210,7 +220,7 @@
 %ant -f dist.xml dist-javadoc
 %endif
 
-%if %{with extras}
+%if %{with webservices}
 mkdir -p output/extras/webservices
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
@@ -279,6 +289,13 @@
 ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib
 ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib
 
+%if %{with webservices}
+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
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -316,8 +333,23 @@
 %{_tomcatdir}/bin/catalina-tasks.xml
 %attr(755,root,root) %{_tomcatdir}/bin/*.sh
 %{_tomcatdir}/bin/*.jar
-%{_tomcatdir}/lib
-%dir %{_tomcatdir}/webapps
+%dir %{_tomcatdir}/lib
+%{_tomcatdir}/lib/annotations-api.jar
+%{_tomcatdir}/lib/catalina.jar
+%{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
+%{_tomcatdir}/lib/jasper-el.jar
+%{_tomcatdir}/lib/jsp-api-2.1.jar
+%{_tomcatdir}/lib/tomcat-i18n-es.jar
+%{_tomcatdir}/lib/catalina-ant.jar
+%{_tomcatdir}/lib/catalina-tribes.jar
+%{_tomcatdir}/lib/el-api.jar
+%{_tomcatdir}/lib/jasper.jar
+%{_tomcatdir}/lib/servlet-api-2.5.jar
+%{_tomcatdir}/lib/tomcat-i18n-fr.jar
+%{_tomcatdir}/lib/catalina-ha.jar
+%{_tomcatdir}/lib/jasper-compiler-jdt.jar
+%{_tomcatdir}/lib/tomcat-coyote.jar
+%{_tomcatdir}/lib/tomcat-i18n-ja.jar
 
 %dir %{_tomcatdir}/webapps
 
@@ -362,6 +394,14 @@
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/examples.xml
 %{_tomcatdir}/webapps/examples
 
+%if %{with webservices}
+%files webservices
+%defattr(644,root,root,755)
+%{_tomcatdir}/lib/wsdl4j.jar
+%{_tomcatdir}/lib/jaxrpc.jar
+%{_tomcatdir}/lib/catalina-ws.jar
+%endif
+
 %files jasper
 %defattr(644,root,root,755)
 %{_javadir}/jasper-compiler-jdt.jar
@@ -379,6 +419,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124.2.13  2009/08/18 12:39:35  pawelz
+- bcond extras renamed to webservices
+- webservices subpackage
+
 Revision 1.124.2.12  2009/08/18 11:25:53  pawelz
 - typo
 
================================================================

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