[ipmiutil/f16] update to upstream ipmiutil-2.8.4
arcress
arcress at fedoraproject.org
Tue Jun 12 17:35:32 UTC 2012
commit f7ca47bac2ff9aedd3a0adcc8563a35e26c19410
Author: Andy Cress <arcress at users.sourceforge.net>
Date: Tue Jun 12 13:35:00 2012 -0400
update to upstream ipmiutil-2.8.4
.gitignore | 1 +
ipmiutil.spec | 110 +++++++++++++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 59 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b3a77d..d6ac05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ ipmiutil-2.6.8.tar.gz
/ipmiutil-2.7.7.tar.gz
/ipmiutil-2.7.9.tar.gz
/ipmiutil-2.8.2.tar.gz
+/ipmiutil-2.8.4.tar.gz
diff --git a/ipmiutil.spec b/ipmiutil.spec
index dda084d..86abe49 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -1,19 +1,23 @@
-Name: ipmiutil
-Version: 2.8.2
-Release: 1%{?dist}
-Summary: Easy-to-use IPMI server management utilities
-License: BSD
-Group: System/Management
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-URL: http://ipmiutil.sourceforge.net
+# spec file for package ipmiutil
+#
+# Copyright (c) 2012 Andy Cress
+#
+Name: ipmiutil
+Version: 2.8.4
+Release: 1%{?dist}
+Summary: Easy-to-use IPMI server management utilities
+License: BSD
+Group: System Environment/Base
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: http://ipmiutil.sourceforge.net
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: openssl-devel gcc gcc-c++ libtool
+# Suggests: cron or vixie-cron or cronie or similar
%if 0%{?fedora} >= 15
Requires: systemd-units
%endif
-# Suggests: cron or vixie-cron or cronie or similar
-%define systemd_fls %{_datadir}/%{name}
-%define init_dir %{_initrddir}
+BuildRequires: openssl-devel gcc gcc-c++ libtool
+%global systemd_fls %{_datadir}/%{name}
+%global init_dir %{_initrddir}
%description
The ipmiutil package provides easy-to-use utilities to view the SEL,
@@ -28,9 +32,9 @@ or the Intel IPMI driver (/dev/imb), etc. If used locally and no driver is
detected, ipmiutil will use user-space direct I/Os instead.
%package devel
-Group: Development/Libraries
-Summary: The includes and static libraries from the ipmiutil package
-Requires: ipmiutil
+Group: Development/Libraries
+Summary: Includes libraries and headers for the ipmiutil package
+Provides: ipmiutil-static = %{version}-%{release}
%description devel
The ipmiutil-devel package contains headers and libraries which are
@@ -41,7 +45,7 @@ useful for building custom IPMI applications.
%build
%configure
-make
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -121,15 +125,13 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root)
-%{_datadir}/%{name}/ipmicmd.h
+# %{_datadir}/%{name} is used by both ipmiutil and ipmituil-devel
+%dir %{_datadir}/%{name}
%{_datadir}/%{name}/ipmi_sample.c
%{_datadir}/%{name}/Makefile
+%{_includedir}/ipmicmd.h
%{_libdir}/libipmiutil.a
-%post devel
-/sbin/ldconfig
-
-%pre
%post
# POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U
@@ -141,18 +143,18 @@ then
scr_dir=%{_datadir}/%{name}
if [ -x /bin/systemctl ]; then
- systemd_dir=%{_unitdir}
- echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env
- cp -f ${scr_dir}/ipmiutil_evt.service ${systemd_dir}
- cp -f ${scr_dir}/ipmiutil_asy.service ${systemd_dir}
- cp -f ${scr_dir}/ipmiutil_wdt.service ${systemd_dir}
- cp -f ${scr_dir}/ipmi_port.service ${systemd_dir}
- # systemctl enable ipmi_port.service >/dev/null 2>&1 || :
+ systemd_dir=%{_unitdir}
+ echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env
+ cp -f ${scr_dir}/ipmiutil_evt.service ${systemd_dir}
+ cp -f ${scr_dir}/ipmiutil_asy.service ${systemd_dir}
+ cp -f ${scr_dir}/ipmiutil_wdt.service ${systemd_dir}
+ cp -f ${scr_dir}/ipmi_port.service ${systemd_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}/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}
fi
# Run some ipmiutil command to see if any IPMI interface works.
@@ -192,18 +194,18 @@ then
if [ -x /bin/systemctl ]; then
systemd_dir=%{_unitdir}
if [ -f ${systemd_dir}/ipmiutil_evt.service ]; then
- systemctl disable ipmi_port.service >/dev/null 2>&1 || :
- systemctl disable ipmiutil_evt.service >/dev/null 2>&1 || :
- systemctl disable ipmiutil_asy.service >/dev/null 2>&1 || :
- systemctl disable ipmiutil_wdt.service >/dev/null 2>&1 || :
- systemctl stop ipmiutil_evt.service >/dev/null 2>&1 || :
- systemctl stop ipmiutil_asy.service >/dev/null 2>&1 || :
- systemctl stop ipmiutil_wdt.service >/dev/null 2>&1 || :
- systemctl stop ipmi_port.service >/dev/null 2>&1 || :
- rm -f ${systemd_dir}/ipmiutil_evt.service
- rm -f ${systemd_dir}/ipmiutil_asy.service
- rm -f ${systemd_dir}/ipmiutil_wdt.service
- rm -f ${systemd_dir}/ipmi_port.service
+ systemctl disable ipmi_port.service >/dev/null 2>&1 || :
+ systemctl disable ipmiutil_evt.service >/dev/null 2>&1 || :
+ systemctl disable ipmiutil_asy.service >/dev/null 2>&1 || :
+ systemctl disable ipmiutil_wdt.service >/dev/null 2>&1 || :
+ systemctl stop ipmiutil_evt.service >/dev/null 2>&1 || :
+ systemctl stop ipmiutil_asy.service >/dev/null 2>&1 || :
+ systemctl stop ipmiutil_wdt.service >/dev/null 2>&1 || :
+ systemctl stop ipmi_port.service >/dev/null 2>&1 || :
+ rm -f ${systemd_dir}/ipmiutil_evt.service
+ rm -f ${systemd_dir}/ipmiutil_asy.service
+ rm -f ${systemd_dir}/ipmiutil_wdt.service
+ rm -f ${systemd_dir}/ipmi_port.service
fi
else
if [ -x /sbin/service ]; then
@@ -218,13 +220,13 @@ then
/sbin/chkconfig --del ipmiutil_asy >/dev/null 2>&1
/sbin/chkconfig --del ipmiutil_evt >/dev/null 2>&1
fi
- 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
+ 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
if [ -f %{_sysconfdir}/cron.daily/checksel ]; then
- rm -f %{_sysconfdir}/cron.daily/checksel
+ rm -f %{_sysconfdir}/cron.daily/checksel
fi
fi
@@ -238,12 +240,14 @@ if [ -x /bin/systemctl ]; then
fi
%changelog
+* Fri May 04 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.4-1
+ Fixups for devel rpm (RH bug #818910)
+* Tue Apr 24 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.3-1
+ Use service_* macros if req_systemd is set
* Thu Mar 08 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.2-1
-- reworked systemd logic/macros, moved ipmiutil from sbindir to bindir,
+ reworked systemd logic/macros, moved ipmiutil from sbindir to bindir
+* Mon Dec 12 2011 Andrew Cress <arcress at users.sourceforge.net> 2.8.0-1
added devel package files
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Fri Nov 11 2011 Andrew Cress <arcress at users.sourceforge.net> 2.7.9-3
fix RH bug #752319 to not copy checksel to cron.daily if IPMI not enabled
* Tue Sep 13 2011 Andrew Cress <arcress at users.sourceforge.net> 2.7.8-1
diff --git a/sources b/sources
index ef96e1d..f320a45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc8e5070b1fddca06c9e66d00da71934 ipmiutil-2.8.2.tar.gz
+73f6c977ef1310ac85c0f20a193caca7 ipmiutil-2.8.4.tar.gz
More information about the scm-commits
mailing list