Date: Sunday, April 1, 2012 @ 09:52:58 Author: guillaume Revision: 155300
archrelease: copy trunk to extra-any Modified: tomcat7/repos/extra-any/PKGBUILD ----------+ PKGBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-01 13:52:23 UTC (rev 155299) +++ PKGBUILD 2012-04-01 13:52:58 UTC (rev 155300) @@ -1,8 +1,8 @@ # Maintainer: Guillaume ALAUX <guilla...@archlinux.org> pkgbase=tomcat7 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7') -pkgver=7.0.25 -pkgrel=1 +pkgver=7.0.22 +pkgrel=2 arch=('any') url='http://tomcat.apache.org/' license=('APACHE') @@ -11,11 +11,13 @@ #makedepends=('java-environment>=6' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj') makedepends=('java-environment=6' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj') source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz + http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz tomcat7.conf.d tomcat7 tomcat7.install) -md5sums=('12ebfd86a071184baac453eaf7c2a760' +md5sums=('878bc216d86ce803f3bbc65fd40eb96c' + 'bd272e9611b0d880fd02493377d4691b' 'eea5573b0acd985bb8b630a20719db76' '361a41c02930a4e43245ab7379a617e9' '6c5b4ed6d71b227f305b751c349fa31b') @@ -30,7 +32,9 @@ ant deploy \ -Dbase.path=${srcdir}/DOWN_LIBS \ -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \ - -Djdt.jar=/usr/share/java/eclipse-ecj.jar + -Djdt.jar=/usr/share/java/eclipse-ecj.jar \ + -Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \ + -Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar } #TODO add test "ant test" @@ -64,8 +68,7 @@ package_tomcat7() { pkgdesc="Servlet-3.0/JSP-2.2 Container" - depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj' - "java-servlet3.0-tomcat=${pkgver}" "java-jsp2.2-tomcat=${pkgver}") + depends=('java-runtime>=6' 'java-jsvc' 'java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'eclipse-ecj') optdepends=('tomcat-native: to allow optimal performance in production environments') backup=(etc/tomcat7/catalina.policy etc/tomcat7/catalina.properties