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

[mharmsen]

commit 18c695f056ee9db7137b81913e73684c9c92d60f
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Wed Mar 21 20:27:59 2012 -0700

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

 .gitignore    |    1 +
 clog          |    5 -----
 pki-ocsp.spec |   22 ++++++++++++++++++++--
 sources       |    2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e1893c..79b3466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pki-ocsp-1.3.3.tar.gz
 /pki-ocsp-9.0.7.tar.gz
 /pki-ocsp-9.0.8.tar.gz
 /pki-ocsp-9.0.9.tar.gz
+/pki-ocsp-9.0.10.tar.gz
diff --git a/pki-ocsp.spec b/pki-ocsp.spec
index a3a3442..c6eb9f2 100644
--- a/pki-ocsp.spec
+++ b/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:             pki-ocsp
-Version:          9.0.9
+Version:          9.0.10
 Release:          1%{?dist}
 Summary:          Certificate System - Online Certificate Status Protocol Manager
 URL:              http://pki.fedoraproject.org/
@@ -152,6 +152,20 @@ echo "D /var/run/pki 0755 root root -"       >> %{buildroot}%{_sysconfdir}/tmpfi
 echo "D /var/run/pki/ocsp 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
 %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%{?fedora} >= 16
 %{__rm} %{buildroot}%{_initrddir}/pki-ocspd
 %else
@@ -163,7 +177,7 @@ echo "D /var/run/pki/ocsp 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfi
 %post
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-ocspd || :
-
+%fix_tomcat_log ocsp
 
 %preun
 if [ $1 = 0 ] ; then
@@ -203,6 +217,7 @@ if [ -d /etc/sysconfig/pki/ocsp ]; then
     done
 fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%fix_tomcat_log ocsp
  
 %preun 
 if [ $1 = 0 ] ; then
@@ -248,6 +263,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 160629a..7833a55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f26569503cbae96b85e6cd27ab3c5764  pki-ocsp-9.0.9.tar.gz
+45882162b20ca90c285857c9609800d2  pki-ocsp-9.0.10.tar.gz