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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 13:55:04
  Author: guillaume
Revision: 205983

Set to be built from binary version

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 12:47:11 UTC (rev 205982)
+++ PKGBUILD	2014-02-15 12:55:04 UTC (rev 205983)
@@ -7,14 +7,12 @@
 url='http://tomcat.apache.org/'
 license=('APACHE')
 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
+source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
         systemd_tomcat6.service
         systemd_tmpfiles.d_tomcat6.conf
         tomcat6.install)
 
-sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
-            '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
+sha256sums=('3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
             '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
             '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
             '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
@@ -22,25 +20,11 @@
 _servletver=2.5
 _jspver=2.1
 
-#FIXME ant target 'download' should not be called
-build() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean download deploy\
-    -Dbase.path=${srcdir}/DOWN_LIBS \
-    -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
-    -Dno.build.dbcp=true
-}
-
-#TODO add test "ant test"
-
 package_java-servlet2.5-tomcat() {
   pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat'
   depends=('java-environment>=5')
 
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
+  cd "${srcdir}/apache-tomcat-${pkgver}/lib"
 
   install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
   install -m644 servlet-api.jar \
@@ -53,7 +37,7 @@
   pkgdesc='JSP 2.1 java library implementation by Apache Tomcat'
   depends=('java-environment>=5')
 
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
+  cd "${srcdir}/apache-tomcat-${pkgver}/lib"
 
   install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
   for j in el-api jsp-api; do
@@ -77,7 +61,7 @@
           etc/tomcat6/web.xml)
   install=tomcat6.install
 
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
+  cd "${srcdir}/apache-tomcat-${pkgver}"
 
   # Tomcat general files
   install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
@@ -98,11 +82,6 @@
           ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
   done
 
-  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
-
   ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
 
   # 66=tomcat / 19=log