[sssd/f12/master] * Tue Aug 03 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-19 - Resolves: rhbz#606887 - sssd

[Stephen Gallagher]

commit 372da2a8f4af1525b2d63a81c622393ac9973d16
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Aug 3 07:56:11 2010 -0400

    * Tue Aug 03 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-19
    - Resolves: rhbz#606887 - sssd stops on upgrade

 sssd.spec |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/sssd.spec b/sssd.spec
index 7c720b9..077c3e6 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -7,7 +7,7 @@ Name: sssd
 Version: 1.2.2
 #Never reset the Release, always increment it
 #Otherwise we can have issues if library versions do not change
-Release: 18%{?dist}
+Release: 19%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -415,22 +415,28 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{servicename}
+
+# Upgrade scripts
 if [ $1 -ge 2 ] ; then
 # a one-time upgrade from confdb v1 to v2, only if upgrading
     python %{_libexecdir}/%{servicename}/upgrade_config.py
 fi
 
+# Install or upgrade
+if [ $1 -ge 1 ] ; then
+# If SSSD was running before, restart it
+    /sbin/service %{servicename} condrestart 2>&1 > /dev/null
+fi
+
 %preun
+
+# Uninstall
 if [ $1 = 0 ]; then
     /sbin/service %{servicename} stop 2>&1 > /dev/null
     /sbin/chkconfig --del %{servicename}
 fi
 
-%postun
-/sbin/ldconfig
-if [ $1 -ge 1 ] ; then
-    /sbin/service %{servicename} condrestart 2>&1 > /dev/null
-fi
+%postun -p /sbin/ldconfig
 
 %post client -p /sbin/ldconfig
 
@@ -453,6 +459,9 @@ fi
 %postun -n libref_array -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 03 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-19
+- Resolves: rhbz#606887 - sssd stops on upgrade
+
 * Mon Aug 02 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-18
 - New stable upstream version 1.2.2
 - The LDAP provider no longer requires access to the LDAP RootDSE. If it is