Imported Upstream version 2.9.7upstream/2.9.7

1 files changed, 11 insertions, 6 deletions

diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 7cae79d..fdb25c3 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 2.9.6
+Version: 2.9.7
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -115,6 +115,7 @@ rm -rf %{buildroot}
 %{_sbindir}/ifirewall 
 %{_sbindir}/ifwum 
 %{_sbindir}/ihpm 
+%{_libdir}/libipmiutil.so*
 %{_datadir}/%{name}/ipmiutil_evt
 %{_datadir}/%{name}/ipmiutil_asy
 %{_datadir}/%{name}/ipmiutil_wdt
@@ -174,7 +175,6 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/ievents.h
 %{_datadir}/%{name}/Makefile
 %{_includedir}/ipmicmd.h
-%{_libdir}/libipmiutil.so
 
 %files static
 %defattr(-,root,root)
@@ -186,6 +186,7 @@ rm -rf %{buildroot}
 %endif
 
 %post
+/sbin/ldconfig
 # POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U
 if [ "$1" = "1" ]
 then
@@ -213,8 +214,8 @@ then
 %endif
 
    # Run some ipmiutil command to see if any IPMI interface works.
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || : 
-   IPMIret=$?
+   IPMIret=0
+   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1  || IPMIret=1
    # If IPMIret==0, the IPMI cmd was successful, and IPMI is enabled locally.
    if [ $IPMIret -eq 0 ]; then
       # If IPMI is enabled, automate managing the IPMI SEL
@@ -245,8 +246,9 @@ then
    fi
 else
    # postinstall, doing rpm update
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || :
-   if [ $? -eq 0 ]; then
+   IPMIret=0
+   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1  || IPMIret=1
+   if [ $IPMIret -eq 0 ]; then
       if [ -d %{_sysconfdir}/cron.daily ]; then
          cp -f %{_datadir}/%{name}/checksel %{_sysconfdir}/cron.daily
       fi
@@ -305,6 +307,7 @@ then
 fi
 
 %postun
+/sbin/ldconfig
 %if 0%{?req_systemd}
 %service_del_postun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
 %else
@@ -335,6 +338,8 @@ fi
 %endif
 
 %changelog
+* Mon Jun 29 2015 Andrew Cress <arcress at users.sourceforge.net> 2.9.7-1
+- move libipmiutil.so from devel into ipmiutil base package (RH#1177213)
 * Mon Nov 03 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.5-1
 - separate libipmiutil.a into ipmiutil-static package
 * Thu Aug 28 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.4-1