Author: pawelz Date: Fri Oct 23 20:48:13 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- R: java-commons-dbcp >= 0:1.1 (*)
- R: java-commons-dbcp-tomcat5 >= 0:1.1
- R: java-commons-pool (*)
- R: java-commons-pool-tomcat5
- BR: java-commons-pool (*)
- BR: java-commons-pool-tomcat5
- TODO: not sure if (*) are realy required, but it is safe to add them.
- rel 5
---- Files affected:
packages/tomcat:
tomcat.spec (1.139 -> 1.140)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.139 packages/tomcat/tomcat.spec:1.140
--- packages/tomcat/tomcat.spec:1.139 Fri Oct 23 11:15:52 2009
+++ packages/tomcat/tomcat.spec Fri Oct 23 22:48:08 2009
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+# TODO:
+# - verify if java-commons-dbcp and java-commons-pool are really required
+# or build-required. (Note that java-commons-{dbcp,pool}-tomcat5 ARE
+# required).
# Conditional build:
%bcond_without javadoc # skip building javadocs
@@ -13,7 +17,7 @@
Summary(pl.UTF-8): Silnik Servlet/JSP Apache będący wzorcową implementacją
API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
Version: 6.0.20
-Release: 4
+Release: 5
License: Apache v2.0
Group: Networking/Daemons/Java
Source0:
http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -46,6 +50,8 @@
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp >= 0:1.1
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
+BuildRequires: java-commons-pool
+BuildRequires: java-commons-pool-tomcat5
%if %{with webservices}
BuildRequires: java(JSR109)
BuildRequires: java-geronimo-spec-jaxrpc
@@ -63,6 +69,10 @@
Requires: %{name}-jasper = %{epoch}:%{version}-%{release}
Requires: java-jdbc-mysql
Requires: java-servletapi = %{epoch}:%{version}-%{release}
+Requires: java-commons-dbcp >= 0:1.1
+Requires: java-commons-dbcp-tomcat5 >= 0:1.1
+Requires: java-commons-pool
+Requires: java-commons-pool-tomcat5
Requires: java-sun-jre >= 1.2
Requires: jaxp_parser_impl
Requires: jndi >= 1.2.1
@@ -420,6 +430,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.140 2009/10/23 20:48:08 pawelz
+- R: java-commons-dbcp >= 0:1.1 (*)
+- R: java-commons-dbcp-tomcat5 >= 0:1.1
+- R: java-commons-pool (*)
+- R: java-commons-pool-tomcat5
+- BR: java-commons-pool (*)
+- BR: java-commons-pool-tomcat5
+- TODO: not sure if (*) are realy required, but it is safe to add them.
+- rel 5
+
Revision 1.139 2009/10/23 09:15:52 pawelz
- build property tomcat-jdt.jar must point to jar that contains eclipse jdt.
The problem was it pointed to itself (/usr/share/java/jasper-compiler-jdt).
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.139&r2=1.140&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
