Author: pawelz Date: Mon Aug 17 15:46:34 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- first attempt to build extras
- more %docs
---- Files affected:
packages/tomcat:
tomcat.spec (1.124.2.9 -> 1.124.2.10)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124.2.9
packages/tomcat/tomcat.spec:1.124.2.10
--- packages/tomcat/tomcat.spec:1.124.2.9 Mon Aug 17 17:00:45 2009
+++ packages/tomcat/tomcat.spec Mon Aug 17 17:46:29 2009
@@ -5,6 +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
#
%define jspapiver 2.1
@@ -28,6 +29,7 @@
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
Patch0: %{name}-build.xml.patch
+Patch1: %{name}-extras.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: apr-devel
BuildRequires: autoconf
@@ -46,6 +48,10 @@
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp >= 0:1.1
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
+%if %{with extras}
+BuildRequires: java-geronimo-spec-jaxrpc
+BuildRequires: java-wsdl4j
+%endif
BuildRequires: jpackage-utils
BuildRequires: junit >= 0:3.8.1
BuildRequires: rpmbuild(macros) >= 1.300
@@ -63,6 +69,10 @@
Requires: java-servletapi = %{epoch}:%{version}-%{release}
Requires: javamail >= 1.2
Requires: jaxp_parser_impl
+%if %{with extras}
+Requires: java-geronimo-spec-jaxrpc
+Requires: java-wsdl4j
+%endif
Requires: jndi >= 1.2.1
Requires: jre >= 1.2
Requires: rc-scripts
@@ -175,7 +185,7 @@
javax.servlet, javax.servlet.http, javax.servlet.jsp, and
javax.servlet.jsp.tagext).
-%description -l pl.UTF-8 -n java-servletapi
+%description -n java-servletapi -l pl.UTF-8
Implementacje klas API Java Servlet i JSP (pakiety javax.servlet,
javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
@@ -183,6 +193,7 @@
%setup -q -n apache-%{name}-%{version}-src
%patch0 -p0
+%patch1 -p0
# we don't need those scripts
rm bin/*.bat
@@ -194,6 +205,17 @@
TOPDIR=$(pwd)
%ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
+%ant -f dist.xml dist-javadoc
+
+%if %{with extras}
+mkdir -p output/extras/webservices
+
+ln -s %{_javadir}/java-geronimo-spec-jaxrpc.jar
output/extras/webservices/jaxrpc.jar
+ln -s %{_javadir}/wsdl4j.jar output/extras/webservices/wsdl4j.jar
+
+%ant -f extras.xml webservices
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -281,7 +303,7 @@
%files
%defattr(644,root,root,755)
-%doc KEYS RELEASE-NOTES RUNNING.txt
+%doc KEYS RELEASE-NOTES RELEASE-PLAN-6.0.txt RUNNING.txt
%attr(754,root,root) /etc/rc.d/init.d/tomcat
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
%{_sysconfdir}
@@ -354,6 +376,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.124.2.10 2009/08/17 15:46:29 pawelz
+- first attempt to build extras
+- more %docs
+
Revision 1.124.2.9 2009/08/17 15:00:45 pawelz
- removed some commented lines
- dropped jta bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.124.2.9&r2=1.124.2.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
