[tomcat6] Resolves: rhbz#66969 - tomcat-jdbc missing. Resolves problem running multiple instances of tomcat se

[Dave Knox]

commit 6b3301f8ed03fbf720655cf1bdb9ab81424e0c3e
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Mon Jan 17 12:01:02 2011 -0700

    Resolves: rhbz#66969 - tomcat-jdbc missing. Resolves problem running multiple instances of tomcat services. References to hardcoded directory locations in tomcat6-6.0.init have been changed to .

 tomcat6-6.0.init |   14 +++++++-------
 tomcat6.spec     |    8 +++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 4123f1c..43f53a4 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -43,17 +43,17 @@ else
     SU="/bin/su -s /bin/sh"
 fi
 
-# Get the tomcat config (use this for environment specific settings)
-TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
 # Get instance specific config file
 if [ -r "/etc/sysconfig/${NAME}" ]; then
     . /etc/sysconfig/${NAME}
 fi
 
+# Get the tomcat config (use this for environment specific settings)
+TOMCAT_CFG="${CATALINA_HOME}/conf/tomcat6.conf"
+if [ -r "$TOMCAT_CFG" ]; then
+    . $TOMCAT_CFG
+fi
+
 # Define which connector port to use
 CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
 
@@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}"
 TOMCAT_USER="${TOMCAT_USER:-tomcat}"
 
 # Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/catalina.out}"
 
 RETVAL="0"
 
diff --git a/tomcat6.spec b/tomcat6.spec
index f6eba5c..d7de59a 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -560,6 +560,12 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon Jan 17 2011 David Knox <dknox at redhat.com> 0:6.0.29-2
+- Resolves: rhbz# 669969 - tomcat-jdbc missing
+- Resolves problem with multiple instances of tomcat services. References to 
+- hardcoded directory locations have been changed to ${CATALINA_HOME]
+- to avoid confusion
+
 * Mon Jan 3 2011 Alexander Kurtakov <akurtako at redhat.com> 0:6.0.29-1
 - Update to new upstream.
 - Simplify buildroot.