[ipmiutil] update to upstream ipmiutil-2.9.0, fix bugs 925593, 865612
arcress
arcress at fedoraproject.org
Tue Apr 9 19:04:40 UTC 2013
commit 28e0b0cc3dd916ae7338b7b71da1c9b5616c85a1
Author: Andy Cress <arcress at users.sourceforge.net>
Date: Tue Apr 9 14:29:32 2013 -0400
update to upstream ipmiutil-2.9.0, fix bugs 925593, 865612
.gitignore | 1 +
ipmiutil.spec | 81 ++++++++++++++++++++++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 56 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b51187e..f1f5515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ ipmiutil-2.6.8.tar.gz
/ipmiutil-2.8.3.tar.gz
/ipmiutil-2.8.4.tar.gz
/ipmiutil-2.8.5.tar.gz
+/ipmiutil-2.9.0.tar.gz
diff --git a/ipmiutil.spec b/ipmiutil.spec
index c5fbcc2..719557f 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -3,8 +3,8 @@
# Copyright (c) 2012 Andy Cress
#
Name: ipmiutil
-Version: 2.8.5
-Release: 3%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
Summary: Easy-to-use IPMI server management utilities
License: BSD
Group: System Environment/Base
@@ -15,9 +15,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 15
Requires: systemd-units
%endif
-BuildRequires: openssl-devel gcc gcc-c++ libtool
-%global systemd_fls %{_datadir}/%{name}
-%global init_dir %{_initrddir}
+%if 0%{?fedora} == 16
+%define unit_dir /lib/systemd/system
+%else
+%define unit_dir %{_unitdir}
+%endif
+%define systemd_fls %{_datadir}/%{name}
+%define init_dir %{_initrddir}
%description
The ipmiutil package provides easy-to-use utilities to view the SEL,
@@ -44,6 +48,9 @@ useful for building custom IPMI applications.
%setup -q
%build
+%if 0%{?fedora} >= 15
+autoconf
+%endif
%configure
make %{?_smp_mflags}
@@ -83,6 +90,7 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ipmiutil_asy
%{_datadir}/%{name}/ipmiutil_wdt
%{_datadir}/%{name}/ipmi_port
+%{_datadir}/%{name}/ipmi_info
%{_datadir}/%{name}/checksel
%{systemd_fls}/ipmiutil_evt.service
%{systemd_fls}/ipmiutil_asy.service
@@ -117,6 +125,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/ihpm.8*
%{_mandir}/man8/isunoem.8*
%{_mandir}/man8/idelloem.8*
+%{_mandir}/man8/ismcoem.8*
%{_mandir}/man8/iekanalyzer.8*
%{_mandir}/man8/itsol.8*
%{_mandir}/man8/idcmi.8*
@@ -128,6 +137,11 @@ rm -rf %{buildroot}
# %{_datadir}/%{name} is used by both ipmiutil and ipmituil-devel
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/ipmi_sample.c
+%{_datadir}/%{name}/ipmi_sample_evt.c
+%{_datadir}/%{name}/isensor.c
+%{_datadir}/%{name}/ievents.c
+%{_datadir}/%{name}/isensor.h
+%{_datadir}/%{name}/ievents.h
%{_datadir}/%{name}/Makefile
%{_includedir}/ipmicmd.h
%{_libdir}/libipmiutil.a
@@ -144,16 +158,17 @@ then
if [ -x /bin/systemctl ]; then
echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env
- cp -f ${scr_dir}/ipmiutil_evt.service %{_unitdir}
- cp -f ${scr_dir}/ipmiutil_asy.service %{_unitdir}
- cp -f ${scr_dir}/ipmiutil_wdt.service %{_unitdir}
- cp -f ${scr_dir}/ipmi_port.service %{_unitdir}
+ cp -f ${scr_dir}/ipmiutil_evt.service %{unit_dir}
+ cp -f ${scr_dir}/ipmiutil_asy.service %{unit_dir}
+ cp -f ${scr_dir}/ipmiutil_wdt.service %{unit_dir}
+ cp -f ${scr_dir}/ipmi_port.service %{unit_dir}
# systemctl enable ipmi_port.service >/dev/null 2>&1 || :
else
cp -f ${scr_dir}/ipmiutil_wdt %{init_dir}
cp -f ${scr_dir}/ipmiutil_asy %{init_dir}
cp -f ${scr_dir}/ipmiutil_evt %{init_dir}
cp -f ${scr_dir}/ipmi_port %{init_dir}
+ cp -f ${scr_dir}/ipmi_info %{init_dir}
fi
# Run some ipmiutil command to see if any IPMI interface works.
@@ -173,8 +188,8 @@ then
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --add ipmi_port
/sbin/chkconfig --add ipmiutil_wdt
- /sbin/chkconfig --add ipmiutil_asy
/sbin/chkconfig --add ipmiutil_evt
+ /sbin/chkconfig --add ipmi_info
fi
fi
@@ -184,12 +199,20 @@ then
%{_bindir}/ipmiutil sensor -q >$sensorout
fi
fi
+else
+ # postinstall, doing rpm update
+ %{_bindir}/ipmiutil sel -v >/dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ if [ -d %{_sysconfdir}/cron.daily ]; then
+ cp -f %{_datadir}/%{name}/checksel %{_sysconfdir}/cron.daily
+ fi
+ fi
fi
%if 0%{?fedora} >= 18
-%systemd_post ipmiutil_evt.service
-%systemd_post ipmiutil_asy.service
+%systemd_post ipmiutil_evt.service
+%systemd_post ipmiutil_asy.service
%systemd_post ipmiutil_wdt.service
-%systemd_post ipmi_port.service
+%systemd_post ipmi_port.service
%endif
%preun
@@ -197,12 +220,12 @@ fi
if [ "$1" = "0" ]
then
if [ -x /bin/systemctl ]; then
- if [ -f %{_unitdir}/ipmiutil_evt.service ]; then
+ if [ -f %{unit_dir}/ipmiutil_evt.service ]; then
%if 0%{?fedora} >= 18
-%systemd_preun ipmiutil_evt.service
-%systemd_preun ipmiutil_asy.service
+%systemd_preun ipmiutil_evt.service
+%systemd_preun ipmiutil_asy.service
%systemd_preun ipmiutil_wdt.service
-%systemd_preun ipmi_port.service
+%systemd_preun ipmi_port.service
%else
systemctl disable ipmi_port.service >/dev/null 2>&1 || :
systemctl disable ipmiutil_evt.service >/dev/null 2>&1 || :
@@ -236,7 +259,7 @@ fi
%postun
if [ -x /bin/systemctl ]; then
%if 0%{?fedora} >= 18
-%systemd_postun_with_restart ipmi_port.service
+%systemd_postun_with_restart ipmi_port.service
%else
systemctl daemon-reload || :
if [ $1 -ge 1 ] ; then
@@ -244,20 +267,24 @@ if [ -x /bin/systemctl ]; then
systemctl try-restart ipmi_port.service || :
fi
%endif
- if [ -f %{_unitdir}/ipmiutil_evt.service ]; then
- rm -f %{_unitdir}/ipmiutil_evt.service
- rm -f %{_unitdir}/ipmiutil_asy.service
- rm -f %{_unitdir}/ipmiutil_wdt.service
- rm -f %{_unitdir}/ipmi_port.service
+ if [ -f %{unit_dir}/ipmiutil_evt.service ]; then
+ rm -f %{unit_dir}/ipmiutil_evt.service
+ rm -f %{unit_dir}/ipmiutil_asy.service
+ rm -f %{unit_dir}/ipmiutil_wdt.service
+ rm -f %{unit_dir}/ipmi_port.service
fi
else
- rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null
- rm -f %{init_dir}/ipmiutil_asy 2>/dev/null
- rm -f %{init_dir}/ipmiutil_evt 2>/dev/null
- rm -f %{init_dir}/ipmi_port 2>/dev/null
+ if [ -f %{init_dir}/ipmiutil_evt.service ]; then
+ rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null
+ rm -f %{init_dir}/ipmiutil_asy 2>/dev/null
+ rm -f %{init_dir}/ipmiutil_evt 2>/dev/null
+ rm -f %{init_dir}/ipmi_port 2>/dev/null
+ fi
fi
%changelog
+* Tue Apr 09 2013 Andrew Cress <arcress at users.sourceforge.net> 2.9.0-1
+ Merged with upstream ipmiutil-2.9.0, fix for Fedora bug #925593
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index b9eab46..06a6067 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56e69955a5fbfe228bd092bd8309cc97 ipmiutil-2.8.5.tar.gz
+cf91a0195f37d234c6184b4a6cd981ef ipmiutil-2.9.0.tar.gz
More information about the scm-commits
mailing list