[pki-ocsp/f16] Bugzilla Bug #749945 - Installation error reported during CA, DRM, OCSP, and TKS package installatio

[kwright]

commit e8943e2b5047998173d64cd026d8fa9bd629a1f0
Author: Kevin Wright <kwright at redhat.com>
Date:   Sun Oct 30 16:43:04 2011 -0700

    Bugzilla Bug #749945 - Installation error reported during CA, DRM,
    OCSP, and TKS package installation . . .

 .gitignore    |    1 +
 clog          |    5 ++---
 pki-ocsp.spec |   46 ++++++++++++++++++++++++++--------------------
 sources       |    2 +-
 4 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c27eda..ee634ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pki-ocsp-1.3.3.tar.gz
 /pki-ocsp-9.0.3.tar.gz
 /pki-ocsp-9.0.6.tar.gz
 /pki-ocsp-9.0.7.tar.gz
+/pki-ocsp-9.0.8.tar.gz
diff --git a/clog b/clog
index 21d3171..db82499 100644
--- a/clog
+++ b/clog
@@ -1,3 +1,2 @@
-Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
-Bugzilla Bug #699809 - Convert CS to use systemd (alee)
-Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
+Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+OCSP, and TKS package installation . . .
diff --git a/pki-ocsp.spec b/pki-ocsp.spec
index 7d7e07b..2eaffb3 100644
--- a/pki-ocsp.spec
+++ b/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:             pki-ocsp
-Version:          9.0.7
+Version:          9.0.8
 Release:          1%{?dist}
 Summary:          Certificate System - Online Certificate Status Protocol Manager
 URL:              http://pki.fedoraproject.org/
@@ -180,26 +180,28 @@ fi
 %else 
 %post 
 # Attempt to update ALL old "OCSP" instances to "systemd"
-for inst in `ls /etc/sysconfig/pki/ocsp`; do
-    if [ ! -e "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service" ]; then
-        ln -s "/lib/systemd/system/pki-ocspd at .service" \
-              "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service"
-        [ -L /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst}
-        ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst}
-
-        if [ -e /var/run/${inst}.pid ]; then
-            kill -9 `cat /var/run/${inst}.pid` || :
-            rm -f /var/run/${inst}.pid
-            echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
-                 /var/lib/${inst}/conf/CS.cfg || :
-            /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-            /bin/systemctl restart pki-ocspd@${inst}.service || :
-        else 
-            echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
-                 /var/lib/${inst}/conf/CS.cfg || :
+if [ -d /etc/sysconfig/pki/ocsp ]; then
+    for inst in `ls /etc/sysconfig/pki/ocsp`; do
+        if [ ! -e "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service" ]; then
+            ln -s "/lib/systemd/system/pki-ocspd at .service" \
+                  "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service"
+            [ -L /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst}
+            ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst}
+
+            if [ -e /var/run/${inst}.pid ]; then
+                kill -9 `cat /var/run/${inst}.pid` || :
+                rm -f /var/run/${inst}.pid
+                echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
+                     /var/lib/${inst}/conf/CS.cfg || :
+                /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                /bin/systemctl restart pki-ocspd@${inst}.service || :
+            else 
+                echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
+                     /var/lib/${inst}/conf/CS.cfg || :
+            fi
         fi
-    fi
-done
+    done
+fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
  
 %preun 
@@ -246,6 +248,10 @@ fi
 
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.8-1
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+  OCSP, and TKS package installation . . .
+
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.7-1
 - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
 - Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/sources b/sources
index 147fbf7..4a62776 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bce8d72f14338ca8e0a737d7d1bb96ca  pki-ocsp-9.0.7.tar.gz
+65d69266cfaa103cc4b951606a1d3676  pki-ocsp-9.0.8.tar.gz