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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 14:19:15
  Author: guillaume
Revision: 205989

Merged back java-jsp2.1 and java-servlet2.5 into tomcat6

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   74 ++++++++++++-------------------------------------------------
 1 file changed, 15 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 13:03:24 UTC (rev 205988)
+++ PKGBUILD	2014-02-15 13:19:15 UTC (rev 205989)
@@ -1,66 +1,33 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.37
-pkgrel=2
+pkgname=tomcat6
+pkgver=6.0.39
+pkgrel=1
+pkgdesc='Servlet-2.5/JSP-2.1 Container'
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
+depends=('java-runtime>=5' 'java-jsvc')
 makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production environments')
+backup=(etc/tomcat6/catalina.policy
+        etc/tomcat6/catalina.properties
+        etc/tomcat6/context.xml
+        etc/tomcat6/logging.properties
+        etc/tomcat6/server.xml
+        etc/tomcat6/tomcat-users.xml
+        etc/tomcat6/web.xml)
+install=tomcat6.install
 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=('3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
+sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
             '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
             '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
             '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
-_servletver=2.5
-_jspver=2.1
-
-package_java-servlet2.5-tomcat() {
-  pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat'
-  depends=('java-environment>=5')
-
-  cd "${srcdir}/apache-tomcat-${pkgver}/lib"
-
-  install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
-  install -m644 servlet-api.jar \
-                ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
-#  ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
-#        ${pkgdir}/usr/share/java/servlet-api.jar
-}
-
-package_java-jsp2.1-tomcat() {
-  pkgdesc='JSP 2.1 java library implementation by Apache Tomcat'
-  depends=('java-environment>=5')
-
-  cd "${srcdir}/apache-tomcat-${pkgver}/lib"
-
-  install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
-  for j in el-api jsp-api; do
-    install -m644 ${j}.jar \
-                  ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
-#    ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar ${pkgdir}/usr/share/java/${j}.jar
-  done
-}
-
 package_tomcat6() {
-  pkgdesc='Servlet-2.5/JSP-2.1 Container'
-  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
-          etc/tomcat6/catalina.properties
-          etc/tomcat6/context.xml
-          etc/tomcat6/logging.properties
-          etc/tomcat6/server.xml
-          etc/tomcat6/tomcat-users.xml
-          etc/tomcat6/web.xml)
-  install=tomcat6.install
-
   cd "${srcdir}/apache-tomcat-${pkgver}"
 
   # Tomcat general files
@@ -71,17 +38,6 @@
 
   install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
 
-  # Provided by previous packages
-  rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-  ln -s /usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
-        ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-
-  for j in el-api jsp-api; do
-    rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
-    ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
-          ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
-  done
-
   ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
 
   # 66=tomcat / 19=log