Date: Sunday, April 15, 2012 @ 10:11:55
Author: guillaume
Revision: 156186
upgpkg: tomcat6 6.0.35-1
Upstream release and added binary tomcat-dbcp.jar
Modified:
tomcat6/trunk/PKGBUILD
----------+
PKGBUILD | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
+++ PKGBUILD 2012-04-15 14:11:55 UTC (rev 156186)
@@ -1,21 +1,21 @@
# Maintainer: Guillaume ALAUX <guilla...@archlinux.org>
pkgbase=tomcat6
pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.33
-pkgrel=4
+pkgver=6.0.35
+pkgrel=1
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon'
'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
+
http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
tomcat6.conf.d
tomcat6
tomcat6.install)
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
+#noextract=(dbcp-${pkgver}.jar)
+md5sums=('4d44a7e7610a83ebe930a781257a8b1d'
+ '171d255cd60894b29a41684ce0ff93a8'
'5a95b41d320aa455fe9cbf97a80b0953'
'8f2ccc09837577394441d29a03b0e667'
'afdb7edc5c7a7b5fa85ad110d021cad3')
@@ -63,7 +63,8 @@
package_tomcat6() {
pkgdesc="Servlet-2.5/JSP-2.1 Container"
- depends=('java-runtime>=5' 'java-jsvc' 'java-servlet2.5-tomcat'
'java-jsp2.1-tomcat' 'eclipse-ecj')
+ depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj'
+ "java-servlet2.5-tomcat=${pkgver}" "java-jsp2.1-tomcat=${pkgver}")
optdepends=('tomcat-native: to allow optimal performance in production
environments')
backup=(etc/tomcat6/catalina.policy
etc/tomcat6/catalina.properties
@@ -86,6 +87,7 @@
# eclipse-ecj is packaged on its own
rm lib/eclipse-ecj.jar
install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+ ln -s /usr/share/java/eclipse-ecj.jar
${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
# Provided by previous packages
rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
@@ -98,7 +100,7 @@
${pkgdir}/usr/share/java/${pkgname}/${j}.jar
done
- install -m644 "${srcdir}/dbcp-${pkgver}.jar" \
+ install -m644 "${srcdir}/apache-tomcat-${pkgver}/lib/tomcat-dbcp.jar" \
${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
ln -s tomcat-dbcp-${pkgver}.jar \
${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
