- 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

Changed files:
    tomcat.spec -> 1.133

diff --git a/tomcat.spec b/tomcat.spec
index 2eb74ce2ba5f50eb46779c4720b4bd225204d2b3..6dcbf8651b4831c004234d4a698cd5de6e7bbfbe 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -60,8 +60,6 @@ Requires(pre):        /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      %{name}-jasper = %{version}-%{release}
 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
 Requires:      java-servletapi = %{epoch}:%{version}-%{release}
 Requires:      java-sun-jre >= 1.2
 Requires:      jaxp_parser_impl


@@ -257,7 +255,7 @@ ln -sf %{_vardir}/conf $TOMCATDIR/conf
 ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 # symlinks instead of copies
 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
 for jar in $jars; do
        jar=$(find-jar $jar)
        ln -sf $jar $TOMCATDIR/bin


@@ -327,6 +325,7 @@ fi
 %{_tomcatdir}/lib/annotations-api.jar
 %{_tomcatdir}/lib/catalina.jar
 %{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
 %{_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
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jsp-api-2.1.jar
 %{_tomcatdir}/lib/tomcat-i18n-es.jar