diff --git a/tomcat7/repos/extra-any/PKGBUILD b/tomcat7/repos/extra-any/PKGBUILD index 68f08c1..328d187 100644 --- a/tomcat7/repos/extra-any/PKGBUILD +++ b/tomcat7/repos/extra-any/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=tomcat7 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7') pkgver=7.0.23 -pkgrel=1 +pkgrel=2 arch=('any') url='http://tomcat.apache.org/' license=('APACHE') @@ -11,13 +11,11 @@ license=('APACHE') #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=('4d78b1b115a4c3fcd079c388a8bbd0ad' - 'bd272e9611b0d880fd02493377d4691b' 'eea5573b0acd985bb8b630a20719db76' '361a41c02930a4e43245ab7379a617e9' '6c5b4ed6d71b227f305b751c349fa31b') @@ -32,9 +30,7 @@ build() { ant deploy \ -Dbase.path=${srcdir}/DOWN_LIBS \ -Dcommons-daemon.jar=/usr/share/java/commons-daemon.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 + -Djdt.jar=/usr/share/java/eclipse-ecj.jar } #TODO add test "ant test"