[arch-commits] Commit in tomcat/repos (3 files)

[Eric Belanger]

    Date: Friday, October 31, 2008 @ 22:25:20
  Author: eric
Revision: 17729

Merged revisions 17654 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/tomcat/trunk

........
  r17654 | hugo | 2008-10-31 07:35:09 -0400 (Fri, 31 Oct 2008) | 2 lines
  
  upgpkg: tomcat 5.5.27-1
      Updated to 5.5.27. Tomcat now uses openjdk6
........

Modified:
  tomcat/repos/extra-x86_64/	(properties)
  tomcat/repos/extra-x86_64/PKGBUILD
  tomcat/repos/extra-x86_64/tomcat

----------+
 PKGBUILD |   12 ++++++------
 tomcat   |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)


Property changes on: tomcat/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /tomcat/trunk:1-12528
   + /tomcat/trunk:1-17728

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-01 02:21:26 UTC (rev 17728)
+++ extra-x86_64/PKGBUILD	2008-11-01 02:25:20 UTC (rev 17729)
@@ -2,20 +2,20 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=tomcat
-pkgver=5.5.26
-pkgrel=2
+pkgver=5.5.27
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
 url="http://tomcat.apache.org/"
 license=('Apache')
-depends=('jre')
-makedepends=('jdk')
+depends=('openjdk6')
+makedepends=('openjdk6')
 backup=(opt/tomcat/conf/server.xml opt/tomcat/conf/tomcat-users.xml \
         etc/conf.d/tomcat)
 install=tomcat.install
 source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz \
         tomcat tomcat.conf.d)
-md5sums=('d7d1ac1505a295ca304dc4e8b5bafdeb' 'c93bad359c8d2ffd6b31947a81d29fff'\
+md5sums=('e576fed8ce66c32ee5295d5f7727b138' '4f171d32c2beb89bf988b7b4555e6cab'
          '4da263803378b208144183c9f7df66a7')
 
 build() {
@@ -23,7 +23,7 @@
   cd ${srcdir}/apache-tomcat-${pkgver}/bin
   tar xzf jsvc.tar.gz
   cd jsvc-src
-  sh configure --with-java=/opt/java
+  sh configure --with-java=/usr/lib/jvm/java-1.6.0-openjdk
   make || return 1
   cp jsvc ..
   

Modified: extra-x86_64/tomcat
===================================================================
--- extra-x86_64/tomcat	2008-11-01 02:21:26 UTC (rev 17728)
+++ extra-x86_64/tomcat	2008-11-01 02:25:20 UTC (rev 17729)
@@ -10,7 +10,7 @@
     stat_busy "Starting Tomcat"
     /opt/tomcat/bin/jsvc \
       -user tomcat \
-      -home /opt/java \
+      -home /usr/lib/jvm/java-1.6.0-openjdk \
       -Dcatalina.home=/opt/tomcat \
       -Dcatalina.base=/opt/tomcat \
       -Djava.io.tmpdir=/opt/tomcat/temp \
@@ -18,7 +18,7 @@
       -pidfile /var/run/tomcat.pid \
       -errfile /opt/tomcat/logs/catalina.log \
       $CATALINA_OPTS \
-      -cp /opt/java/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
+      -cp /usr/lib/jvm/java-1.6.0-openjdk/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
       org.apache.catalina.startup.Bootstrap
 
     if [ $? -gt 0 ]; then