[tomcat6: 2/2] merged auto message with current build

[Dave Knox]

commit eea1f30f107f83f4298743d4fc7502bcdb9170c6
Merge: 3cb34c7 b6cdbc0
Author: david knox 
Date:   Mon Feb 28 15:53:47 2011 -0700

merged auto message with current build

tomcat6.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc tomcat6.spec
index 18cceb0,960b4a7..575bc7e
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@@ -272,8 -269,6 +272,7 @@@ zip -u output/build/lib/jsp-api.jar MET
  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
  %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
 +/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
- chmod 775 ${RPM_BUILD__ROOT}%{logdir}/catalina.out
  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
@@@ -567,10 -561,8 +566,14 @@@ f
  %{appdir}/sample

%changelog
- * Mon Feb 7 2011 David Knox  0:6.0.32-1
++* Mon Feb 28 2011 David Knox  0:6.0.32-1
 +- Rebase on 6.0.32 with several bug fixes and security fixes
 +- changed apache-commons to jakarta-commons to fix missing
- - dependencies during install. 
++- dependencies during install. Adjusted permissions on logs and
++- conf dirs so init worked. Reversed order of reading conf files
++
+ * Wed Feb 09 2011 Fedora Release Engineering  - 0:6.0.30-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

* Thu Feb 3 2011 Alexander Kurtakov  0:6.0.30-1
  - Update to 6.0.30.