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

[Guillaume Alaux]

    Date: Monday, June 27, 2011 @ 07:22:38
  Author: guillaume
Revision: 129404

upgpkg: tomcat6 6.0.32-2
Added etc/conf.d/tomcat6 to backup array

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-27 11:10:06 UTC (rev 129403)
+++ PKGBUILD	2011-06-27 11:22:38 UTC (rev 129404)
@@ -1,13 +1,13 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 pkgname=tomcat6
 pkgver=6.0.32
-pkgrel=1
+pkgrel=2
 pkgdesc="Servlet-2.5/JSP-2.1 Container"
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
 depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon' 'eclipse-ecj')
+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
@@ -15,7 +15,8 @@
         etc/tomcat6/logging.properties
         etc/tomcat6/server.xml
         etc/tomcat6/tomcat-users.xml
-        etc/tomcat6/web.xml)
+        etc/tomcat6/web.xml
+        etc/conf.d/tomcat6)
 install=tomcat6.install
 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
@@ -79,7 +80,7 @@
   ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
 
   # Arch scripts
-  install -Dm644 ${srcdir}/tomcat6.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat6 ${pkgdir}/etc/rc.d/${pkgname}
+  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
 }