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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 16:01:08
  Author: guillaume
Revision: 206004

Reconciliate PKGBUILD with tomcat8 (2/2)

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 14:51:41 UTC (rev 206003)
+++ PKGBUILD	2014-02-15 15:01:08 UTC (rev 206004)
@@ -2,24 +2,24 @@
 pkgname=tomcat6
 pkgver=6.0.39
 pkgrel=1
-pkgdesc='Open source software implementation of the Java Servlet and JavaServer Pages technologies'
+pkgdesc='Open source implementation of the Java Servlet 2.5 and JavaServer Pages 2.1 technologies'
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
 depends=('java-runtime>=5' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
 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
+backup=(etc/${pkgname}/catalina.policy
+        etc/${pkgname}/catalina.properties
+        etc/${pkgname}/context.xml
+        etc/${pkgname}/logging.properties
+        etc/${pkgname}/server.xml
+        etc/${pkgname}/tomcat-users.xml
+        etc/${pkgname}/web.xml)
+install=${pkgname}.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)
+        systemd_${pkgname}.service
+        systemd_tmpfiles.d_${pkgname}.conf
+        ${pkgname}.install)
 
 sha256sums=('debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7'
             'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
@@ -27,8 +27,8 @@
             '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
 
 _gid_log=19
-_gid_tomcat6=66
-_uid_tomcat6=66
+_gid_tomcat=66
+_uid_tomcat=66
 
 package() {
   cd "${srcdir}/apache-tomcat-${pkgver}"
@@ -48,28 +48,28 @@
   ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
 
   # We log through systemd but this would still be required for stock Tomcat logging
-  install -dm775 -o ${_uid_tomcat6} -g ${_gid_log} "${pkgdir}"/var/log/${pkgname}
+  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/${pkgname}
   ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
   touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
   chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
 
   install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat6} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat6} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
+  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
+  install -d -g ${_gid_tomcat} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
   ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
 
   install -dm775 "${pkgdir}"/var/lib/${pkgname}
   cp -r webapps "${pkgdir}"/var/lib/${pkgname}
-  chown -R ${_uid_tomcat6}:${_gid_tomcat6} "${pkgdir}"/var/lib/${pkgname}
+  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
   ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
 
   install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} "${pkgdir}"/var/tmp/${pkgname}/{temp,work}
+  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} "${pkgdir}"/var/tmp/${pkgname}/{temp,work}
   ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
   ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
 
-  install -Dm644 "${srcdir}"/systemd_tomcat6.service \
+  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
                  "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_tmpfiles.d_tomcat6.conf \
+  install -Dm644 "${srcdir}"/systemd_tmpfiles.d_${pkgname}.conf \
                  "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
 }