[pki-kra/f16] Resolves Bugzilla Bug #802396 - Change location of TOMCAT_LOG to match tomcat6 changes

[mharmsen]

commit ba8ea83a00d1bed657d834e5697be009054636ba
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Wed Mar 21 20:11:55 2012 -0700

    Resolves Bugzilla Bug #802396 - Change location of TOMCAT_LOG to match tomcat6 changes

 .gitignore   |    1 +
 clog         |    5 -----
 pki-kra.spec |   22 ++++++++++++++++++++--
 sources      |    2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14af44b..0987549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pki-kra-1.3.4.tar.gz
 /pki-kra-9.0.8.tar.gz
 /pki-kra-9.0.9.tar.gz
 /pki-kra-9.0.10.tar.gz
+/pki-kra-9.0.11.tar.gz
diff --git a/pki-kra.spec b/pki-kra.spec
index bd14308..e5978fd 100644
--- a/pki-kra.spec
+++ b/pki-kra.spec
@@ -1,5 +1,5 @@
 Name:             pki-kra
-Version:          9.0.10
+Version:          9.0.11
 Release:          1%{?dist}
 Summary:          Certificate System - Data Recovery Manager
 URL:              http://pki.fedoraproject.org/
@@ -152,11 +152,25 @@ echo "D /var/run/pki/kra 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfil
 %{__rm} -rf %{buildroot}%{_unitdir}
 %endif
 
+# tomcat6 has changed how TOMCAT_LOG is used.
+# Need to adjust accordingly
+# This macro will be executed in the postinstall scripts
+%define fix_tomcat_log() (                                                   \
+if [ -d /etc/sysconfig/pki/%i ]; then                                        \
+  for F in `find /etc/sysconfig/pki/%1 -type f`; do                          \
+    instance=`basename $F`                                                   \
+    if [ -f /etc/sysconfig/$instance ]; then                                 \
+        sed -i -e 's/catalina.out/tomcat-initd.log/' /etc/sysconfig/$instance \
+    fi                                                                       \
+  done                                                                       \
+fi                                                                           \
+)
+
 %if 0%{?rhel} || 0%{?fedora} < 16
 %post
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-krad || :
-
+%fix_tomcat_log kra
 
 %preun
 if [ $1 = 0 ] ; then
@@ -195,6 +209,7 @@ if [ -d /etc/sysconfig/pki/kra ]; then
     done
 fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%fix_tomcat_log kra
  
 %preun 
 if [ $1 = 0 ] ; then
@@ -238,6 +253,9 @@ fi
 
 
 %changelog
+* Fri Mar 16 2012 Ade Lee <alee at redhat.com> 9.0.11-1
+- BZ 802396 - Change location of TOMCAT_LOG to match tomcat6 changes
+
 * Fri Mar  9 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.10-1
 - Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync
   with DOGTAG_9_BRANCH SVN repository . . .
diff --git a/sources b/sources
index b6553f8..1e4ce68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0368c9071d7440d68c5350af5e8ef506  pki-kra-9.0.10.tar.gz
+1c8d6ac260ef16f4ea0fab80cfa9566f  pki-kra-9.0.11.tar.gz