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

[mharmsen]

commit 6a095cbb9827e0004bd4bdae30fffb7b58c960bd
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Wed Mar 21 20:48:08 2012 -0700

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

 .gitignore   |    1 +
 clog         |    5 -----
 pki-tks.spec |   23 +++++++++++++++++++++--
 sources      |    2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6963e4..48a594a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pki-tks-1.3.3.tar.gz
 /pki-tks-9.0.6.tar.gz
 /pki-tks-9.0.8.tar.gz
 /pki-tks-9.0.9.tar.gz
+/pki-tks-9.0.10.tar.gz
diff --git a/pki-tks.spec b/pki-tks.spec
index c0db45d..a2e47e0 100644
--- a/pki-tks.spec
+++ b/pki-tks.spec
@@ -1,5 +1,5 @@
 Name:             pki-tks
-Version:          9.0.9
+Version:          9.0.10
 Release:          1%{?dist}
 Summary:          Certificate System - Token Key Service
 URL:              http://pki.fedoraproject.org/
@@ -153,10 +153,25 @@ echo "D /var/run/pki/tks 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-tksd || :
+%fix_tomcat_log tks
 
 %preun
 if [ $1 = 0 ] ; then
@@ -194,7 +209,8 @@ if [ -d /etc/sysconfig/pki/tks ]; then
     done
 fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- 
+%fix_tomcat_log tks
+
 %preun
 if [ $1 = 0 ] ; then
     /bin/systemctl --no-reload disable pki-tksd.target > /dev/null 2>&1 || :
@@ -238,6 +254,9 @@ fi
 
 
 %changelog
+* Fri Mar 16 2012 Ade Lee <alee at redhat.com> 9.0.10-1
+- BZ 802396 - Change location of TOMCAT_LOG to match tomcat6 changes
+
 * Fri Mar  9 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.9-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 db81301..8143c69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a219d5b5ba4206b9e8c670e156519a03  pki-tks-9.0.9.tar.gz
+1101c3682cffccb65f5df86fce6e0cca  pki-tks-9.0.10.tar.gz