[arch-commits] Commit in tomcat6/trunk (PKGBUILD systemd.tomcat6.service tomcat6)

[Guillaume Alaux]

    Date: Saturday, December 15, 2012 @ 13:15:33
  Author: guillaume
Revision: 173234

Rebuild without ecj dur to version incompatibility - sources

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/systemd.tomcat6.service
  tomcat6/trunk/tomcat6

-------------------------+
 PKGBUILD                |   22 +++++++++-------------
 systemd.tomcat6.service |    2 +-
 tomcat6                 |    2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-15 17:19:51 UTC (rev 173233)
+++ PKGBUILD	2012-12-15 18:15:33 UTC (rev 173234)
@@ -2,11 +2,11 @@
 pkgbase=tomcat6
 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.36
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon' 'eclipse-ecj')
+makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon')
 source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
         http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
         tomcat6.conf.d
@@ -14,12 +14,12 @@
         tomcat6.install
         systemd.tomcat6.service)
 
-md5sums=('654318c1e88fdc8b7b5182c4479612b1'
-         '3dde098fd0b3a08d3f2867e4a95591ba'
-         '8692b87cf2d003e6805c6de4409bc851'
-         '8f2ccc09837577394441d29a03b0e667'
-         'afdb7edc5c7a7b5fa85ad110d021cad3'
-         'fcb7a0e5a5dec517dda77ee430289f38')
+sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
+            'bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e'
+            '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
+            'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
+            '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2'
+            'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599')
 
 _servletver=2.5
 _jspver=2.1
@@ -33,7 +33,6 @@
   ant download deploy\
     -Dbase.path=${srcdir}/DOWN_LIBS \
     -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
-    -Djdt.jar=/usr/share/java/eclipse-ecj.jar \
     -Dno.build.dbcp=true
 }
 
@@ -68,7 +67,7 @@
 
 package_tomcat6() {
   pkgdesc="Servlet-2.5/JSP-2.1 Container"
-  depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj'
+  depends=('java-runtime>=5' 'java-jsvc'
            "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
@@ -89,10 +88,7 @@
   rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
   cp -r bin ${pkgdir}/usr/share/${pkgname}
 
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
 
   # Provided by previous packages
   rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar

Modified: systemd.tomcat6.service
===================================================================
--- systemd.tomcat6.service	2012-12-15 17:19:51 UTC (rev 173233)
+++ systemd.tomcat6.service	2012-12-15 18:15:33 UTC (rev 173234)
@@ -15,7 +15,7 @@
             -Dcatalina.home=${CATALINA_HOME} \
             -Dcatalina.base=${CATALINA_BASE} \
             -Djava.io.tmpdir=/var/tmp/tomcat6/temp \
-            -cp /usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
+            -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
             -user tomcat \
             -java-home ${TOMCAT_JAVA_HOME} \
             -wait 10 \

Modified: tomcat6
===================================================================
--- tomcat6	2012-12-15 17:19:51 UTC (rev 173233)
+++ tomcat6	2012-12-15 18:15:33 UTC (rev 173234)
@@ -18,7 +18,7 @@
         -Dcatalina.home=${CATALINA_HOME} \
         -Dcatalina.base=${CATALINA_BASE} \
         -Djava.io.tmpdir=/var/tmp/tomcat6/temp \
-        -cp /usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
+        -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
         -user tomcat \
         -java-home ${TOMCAT_JAVA_HOME} \
         -wait 10 \