[tomcat6] resolves rhbz 734886

[Dave Knox]

commit 3c498d54095098ca4b4859b9f629178b4103ac4c
Author: David Knox <dknox at dknox-laptop.(none)>
Date:   Wed Aug 31 13:45:09 2011 -0600

    resolves rhbz 734886

 tomcat6-6.0.wrapper |   12 ++++++------
 tomcat6.spec        |    5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/tomcat6-6.0.wrapper b/tomcat6-6.0.wrapper
index 979f0a7..0e95331 100644
--- a/tomcat6-6.0.wrapper
+++ b/tomcat6-6.0.wrapper
@@ -8,13 +8,13 @@ else
 fi
 
 # Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-  TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
-fi
+#if [ -z "${TOMCAT_CFG}" ]; then
+#  TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+#fi
 
-if [ -r "$TOMCAT_CFG" ]; then
-  . $TOMCAT_CFG
-fi
+#if [ -r "$TOMCAT_CFG" ]; then
+#  . $TOMCAT_CFG
+#fi
 
 set_javacmd
 
diff --git a/tomcat6.spec b/tomcat6.spec
index 327195f..17efc52 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       14%{?dist}
+Release:       15%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -578,6 +578,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Wed Aug 31 2011 David Knox <dknox at redhat.com> 0:6.0.32-14
+- Resolves: rhbz 734886 - additionally created instances regression
+
 * Wed Aug 31 2011 Orion Poplawski <orion at cora.nwra.com> 0:6.0.32-14
 - Drop %%update_maven_depmap (Bug #724985)