[tomcat/f17] - Updated to 7.0.32 - Resolves: rhbz 863307 read CATALINA_PID from env on tomcat-sysd

[Ivan Afonichev]

commit c3f10647d30ce0e504a1ef8e42796229a7ebe30c
Author: Ivan Afonichev <ivan.afonichev at gmail.com>
Date:   Fri Oct 19 02:37:21 2012 +0400

    - Updated to 7.0.32
    - Resolves: rhbz 863307 read CATALINA_PID from env on tomcat-sysd

 sources                |    2 +-
 tomcat-7.0-tomcat-sysd |    2 +-
 tomcat.spec            |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 6fc9dbc..80f932f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16b9f637e5ca623cf87a2a1514c8978e  apache-tomcat-7.0.29-src.tar.gz
+daf3de124ec09702560931e87219deb6  apache-tomcat-7.0.32-src.tar.gz
diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
index 1e79816..bd0e028 100644
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@ -61,7 +61,7 @@ function parseOptions() {
 # See how we were called.
 function start() {
     # fix permissions on the log and pid files
-    export CATALINA_PID="/var/run/${NAME}.pid"
+    export CATALINA_PID="${CATALINA_PID:-/var/run/${NAME}.pid}"
     touch $CATALINA_PID 2>&1 
     if [ "$?" -eq "0" ]; then
       chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
diff --git a/tomcat.spec b/tomcat.spec
index df758e8..8f8349d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.2
 %global major_version 7
 %global minor_version 0
-%global micro_version 29
+%global micro_version 32
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 3.0
 %global elspec 2.2
@@ -660,6 +660,10 @@ fi
 %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
 
 %changelog
+* Fri Oct 19 2012 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.32-1
+- Updated to 7.0.32
+- Resolves: rhbz 863307 read CATALINA_PID from env on tomcat-sysd
+
 * Thu Jul 26 2012 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.29-1
 - Updated to 7.0.29