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

[mharmsen]

commit fea088f56e0ae70c552061e9451667a51587e4a4
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Wed Mar 21 19:53:39 2012 -0700

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

 .gitignore    |    1 +
 clog          |   30 ------------------------------
 pki-core.spec |   24 +++++++++++++++++++++---
 sources       |    2 +-
 4 files changed, 23 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c14dc4..a465d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /pki-core-9.0.16.tar.gz
 /pki-core-9.0.17.tar.gz
 /pki-core-9.0.18.tar.gz
+/pki-core-9.0.19.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index c127d29..1b848fd 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -1,5 +1,5 @@
 Name:             pki-core
-Version:          9.0.18
+Version:          9.0.19
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
@@ -445,7 +445,7 @@ This package is a part of the PKI Core used by the Certificate System.
 
 
 %if 0%{?fedora} >= 17
-%patch0 -p2 -b .f17
+%patch1 -p2 -b .f17
 %else
 %if 0%{?fedora} >= 16
 %patch0 -p2 -b .f16
@@ -506,6 +506,19 @@ echo "D /var/run/pki/ca 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfile
 %{__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                                                                           \
+)
 
 %pre -n pki-selinux
 %saveFileContext targeted
@@ -532,7 +545,7 @@ fi
 %post -n pki-ca 
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-cad || :
-
+%fix_tomcat_log ca
 
 %preun -n pki-ca
 if [ $1 = 0 ] ; then
@@ -572,6 +585,7 @@ if [ -d /etc/sysconfig/pki/ca ]; then
     done
 fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%fix_tomcat_log ca
 
 %preun -n pki-ca
 if [ $1 = 0 ] ; then
@@ -735,6 +749,10 @@ fi
 
 
 %changelog
+* Fri Mar 16 2012 Ade Lee <alee at redhat.com> 9.0.19-1
+- BZ 802396 - Change location of TOMCAT_LOG to match tomcat6 changes
+- Corrected patch selected for selinux f17 rules
+
 * Fri Mar  9 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.18-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 359874a..4988d31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80b9c6206aab91db13d2fb16798b2968  pki-core-9.0.18.tar.gz
+698c21a3d9198704d15adfb91f827102  pki-core-9.0.19.tar.gz