packages: tomcat/tomcat.spec - symlink commons-pool-tomcat5.jar to tomcat l...

[pawelz]

Author: pawelz                       Date: Wed Sep  2 09:30:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- symlink commons-pool-tomcat5.jar to tomcat lib dir
- drop deps that should be auto generated (symlinks)
- symlink commons-dbcp-tomcat5.jar instead of copy

---- Files affected:
packages/tomcat:
   tomcat.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.132 packages/tomcat/tomcat.spec:1.133
--- packages/tomcat/tomcat.spec:1.132	Fri Aug 28 13:14:33 2009
+++ packages/tomcat/tomcat.spec	Wed Sep  2 11:30:14 2009
@@ -61,8 +61,6 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-jasper = %{version}-%{release}
-Requires:	java-commons-daemon
-Requires:	java-commons-logging
 Requires:	java-servletapi = %{epoch}:%{version}-%{release}
 Requires:	java-sun-jre >= 1.2
 Requires:	jaxp_parser_impl
@@ -258,7 +256,7 @@
 ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 # symlinks instead of copies
-jars="commons-daemon commons-logging-api"
+jars="commons-daemon commons-logging-api commons-dbcp-tomcat5 commons-pool-tomcat5"
 for jar in $jars; do
 	jar=$(find-jar $jar)
 	ln -sf $jar $TOMCATDIR/bin
@@ -328,6 +326,7 @@
 %{_tomcatdir}/lib/annotations-api.jar
 %{_tomcatdir}/lib/catalina.jar
 %{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
+%{_tomcatdir}/lib/commons-pool-tomcat5.jar
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jsp-api-2.1.jar
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
@@ -410,6 +409,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2009/09/02 09:30:14  pawelz
+- symlink commons-pool-tomcat5.jar to tomcat lib dir
+- drop deps that should be auto generated (symlinks)
+- symlink commons-dbcp-tomcat5.jar instead of copy
+
 Revision 1.132  2009/08/28 11:14:33  pawelz
 - tomcat config files should not be readeable by everyone since they can
   contain some passwords (for example tomcat-users.xml)
================================================================

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