[arch-commits] Commit in tomcat7/trunk (PKGBUILD)

Guillaume Alaux guillaume at archlinux.org
Sun Jan 29 17:41:38 UTC 2012


    Date: Sunday, January 29, 2012 @ 12:41:38
  Author: guillaume
Revision: 148002

upgpkg: tomcat7 7.0.25-1

Upstream release + added back tomcat-dbcp

Modified:
  tomcat7/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-29 16:01:17 UTC (rev 148001)
+++ PKGBUILD	2012-01-29 17:41:38 UTC (rev 148002)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 pkgbase=tomcat7
 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.23
+pkgver=7.0.25
 pkgrel=1
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -11,13 +11,11 @@
 #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'
+md5sums=('12ebfd86a071184baac453eaf7c2a760'
          'eea5573b0acd985bb8b630a20719db76'
          '361a41c02930a4e43245ab7379a617e9'
          '6c5b4ed6d71b227f305b751c349fa31b')
@@ -32,9 +30,7 @@
   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"




More information about the arch-commits mailing list