%post, %pre -p /sbin/ldconfig handling (1312374, 1315024)

glusterfs.spec

@@ -169,7 +169,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.7.8
-Release:          3%{?prereltag:.%{prereltag}}%{?dist}
+Release:          4%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -793,26 +793,25 @@ rm -rf %{buildroot}
 ##-----------------------------------------------------------------------------
 ## All %%post should be placed here and keep them sorted
 ##
-%post
+%post -p /sbin/ldconfig
 
-%post api
-/sbin/ldconfig
+%post api -p /sbin/ldconfig
 
-%post fuse
 %if ( 0%{?rhel} == 5 )
+%post fuse
 modprobe fuse
+exit 0
 %endif
 
 %if ( 0%{!?_without_georeplication:1} )
 %post geo-replication
-#restart glusterd.
 if [ $1 -ge 1 ]; then
     %_init_restart glusterd
 fi
+exit 0
 %endif
 
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
 %post server
 # Legacy server
@@ -886,6 +885,7 @@ else
     #rpm_script_t context.
     rm -rf /var/run/glusterd.socket
 fi
+exit 0
 
 ##-----------------------------------------------------------------------------
 ## All %%preun should be placed here and keep them sorted
@@ -907,27 +907,26 @@ if [ $1 -ge 1 ]; then
     fi
     %_init_restart glusterd
 fi
+exit 0
 
 ##-----------------------------------------------------------------------------
 ## All %%postun should be placed here and keep them sorted
 ##
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun api
-/sbin/ldconfig
+%postun api -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
-%postun server
 %if (0%{?_with_firewalld:1})
+%postun server
 #reload service files if firewalld running
 if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
     firewall-cmd  --reload
 fi
+exit 0
 %endif
 
-%postun libs
-/sbin/ldconfig
-
 ##-----------------------------------------------------------------------------
 ## All %%files should be placed here and keep them sorted by groups
 ##
@@ -1235,6 +1234,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 4 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.8-4
+- %%post, %%pre -p /sbin/ldconfig handling (1312374, 1315024)
+
 * Fri Mar 4 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.8-3
 - Requires /bin/dbus -> dbus
 - quiet %%post server (1312897)