[tomcat6] Resolves: rhbz 831464 CATALINA_PID permissions

[Dave Knox]

commit 3fc017435d44d1c7cdf6766f66214c8efea54c97
Author: DKnox <dknox at redhat.com>
Date:   Sat Jun 16 10:57:54 2012 -0600

    Resolves: rhbz 831464 CATALINA_PID permissions

 tomcat6-6.0.init |    4 ++--
 tomcat6.spec     |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 8cb2bb9..3a07cda 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -165,11 +165,11 @@ function start() {
     export CATALINA_PID="/var/run/${NAME}.pid"
     touch $CATALINA_PID 2>&1 || RETVAL="4"
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then 
-      chown ${TOMCAT_USER}:root $CATALINA_PID
+      chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
     fi
     [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" 
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
-      chown ${TOMCAT_USER}:root $TOMCAT_LOG
+      chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
     fi
     if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then
         # Create a tomcat directory if it doesn't exist
diff --git a/tomcat6.spec b/tomcat6.spec
index 29323a7..a11e31a 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -94,7 +94,7 @@ BuildRequires: jakarta-commons-daemon
 BuildRequires: jakarta-commons-dbcp
 BuildRequires: jakarta-commons-pool
 BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-devel
+BuildRequires: java-devel >= 0:1.6.0
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 BuildRequires: log4j
@@ -104,7 +104,7 @@ Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-collections
 Requires:      jakarta-commons-dbcp
 Requires:      jakarta-commons-pool
-Requires:      java 
+Requires:      java >= 0:1.6.0
 Requires:      procps
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(pre):    shadow-utils
@@ -640,6 +640,10 @@ fi
 %{_initrddir}/%{name}
 
 %changelog
+* Wed Jun 13 2012 David Knox <dknox at redhat.com> 0:6.0.35-3
+- Adjusted ownership of CATALINA_PID to TOMCAT_USER:TOMCAT_USER
+- rhbz 831464
+
 * Tue May 29 2012 David Knox <dknox at redhat.com> 0:6.0.35-2
 - Resolves: rhbz 748913 - logrotate fails due to permissions
 - on catalina.out. Changes made to tomcat6-6.0.logrotate