From 131ceacb909c90a5aa0658a77c6098de5ec8612a Mon Sep 17 00:00:00 2001 From: Phil Knirsch Date: Tue, 18 Dec 2007 15:32:40 +0000 Subject: [PATCH] - Update to freeipmi-0.5.1 - Remove ipmimonitoring subpackage. Merge into head package. --- .cvsignore | 2 +- freeipmi.spec | 75 +++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.cvsignore b/.cvsignore index ccfa953..23a66ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -freeipmi-0.4.6.tar.gz +freeipmi-0.5.1.tar.gz diff --git a/freeipmi.spec b/freeipmi.spec index ba01941..ad84f40 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -3,11 +3,11 @@ # %define name freeipmi -%define version 0.4.6 +%define version 0.5.1 %if %{?_with_debug:1}%{!?_with_debug:0} -%define release 3.debug%{?dist} +%define release 1.debug%{?dist} %else -%define release 3%{?dist} +%define release 1%{?dist} %endif Name: %{name} @@ -16,12 +16,9 @@ Release: %{release} License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/freeipmi/ -Source: ftp://ftp.zresearch.com/pub/freeipmi/0.4.6/%{name}-%{version}.tar.gz -Patch0: freeipmi-0.4.6-rpmlint.patch -Patch1: freeipmi-0.4.6-open.patch -Patch2: freeipmi-0.4.6-daemon.patch +Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgcrypt-devel +BuildRequires: libgcrypt-devel texinfo Requires(post): info Requires(preun): info # Necessary as only those archs implement iopl and friends (#368541) @@ -50,13 +47,6 @@ Requires: logrotate %description bmc-watchdog Provides a watchdog daemon for OS monitoring and recovery. -%package ipmimonitoring -Summary: Ipmimonitoring library -Group: Applications/System -Requires: freeipmi = %{version}-%{release} -%description ipmimonitoring -Provides library for IPMI host monitoring. - %package ipmidetectd Summary: IPMI node detection monitoring daemon Group: Applications/System @@ -72,9 +62,6 @@ Provides a tool and a daemon for IPMI node detection. %prep %setup -q -%patch0 -p1 -b .rpmlint -%patch1 -p1 -b .open -%patch2 -p1 -b .daemon %build %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ @@ -149,10 +136,6 @@ if [ "$1" = 0 ]; then fi fi -%post ipmimonitoring -p /sbin/ldconfig - -%postun ipmimonitoring -p /sbin/ldconfig - %post ipmidetectd if [ "$1" = 1 ]; then if [ -x %{_initrddir}/freeipmi-ipmidetectd ]; then @@ -185,6 +168,7 @@ fi %files %defattr(-,root,root) +%attr(0444,root,root) %config(noreplace) %{_sysconfdir}/ipmi_monitoring_sensors.conf %doc %{_datadir}/doc/%{name}/AUTHORS %doc %{_datadir}/doc/%{name}/COPYING %doc %{_datadir}/doc/%{name}/ChangeLog @@ -195,20 +179,30 @@ fi %doc %{_datadir}/doc/%{name}/TODO %doc %{_infodir}/* %doc %{_datadir}/doc/%{name}/COPYING.ipmiping -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping %doc %{_datadir}/doc/%{name}/COPYING.ipmipower -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower %doc %{_datadir}/doc/%{name}/COPYING.rmcpping -%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping %doc %{_datadir}/doc/%{name}/COPYING.ipmiconsole -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole +%doc %{_datadir}/doc/%{name}/COPYING.ipmimonitoring %doc %{_datadir}/doc/%{name}/COPYING.pstdout -%doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout %doc %{_datadir}/doc/%{name}/COPYING.ipmidetect -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect %doc %{_datadir}/doc/%{name}/COPYING.ipmi-fru -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru %doc %{_datadir}/doc/%{name}/COPYING.ZRESEARCH +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower +%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring +%doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect.UC +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru.UC %doc %{_datadir}/doc/%{name}/freeipmi-coding.txt %doc %{_datadir}/doc/%{name}/freeipmi-hostrange.txt %doc %{_datadir}/doc/%{name}/freeipmi-libraries.txt @@ -216,8 +210,8 @@ fi %{_libdir}/libipmiconsole*so.* %{_libdir}/libfreeipmi*so.* %{_libdir}/libipmidetect*so.* +%{_libdir}/libipmimonitoring.so.* %{_localstatedir}/lib/* -%{_sbindir}/bmc-autoconfig %{_sbindir}/bmc-config %{_sbindir}/bmc-info %{_sbindir}/ipmi-fru @@ -230,9 +224,9 @@ fi %{_sbindir}/ipmipower %{_sbindir}/rmcpping %{_sbindir}/ipmiconsole +%{_sbindir}/ipmimonitoring %{_sbindir}/ipmi-chassis %{_sbindir}/ipmidetect -%{_mandir}/man8/bmc-autoconfig.8* %{_mandir}/man8/bmc-config.8* %{_mandir}/man5/bmc-config.conf.5* %{_mandir}/man8/bmc-info.8* @@ -248,10 +242,12 @@ fi %{_mandir}/man8/rmcpping.8* %{_mandir}/man8/ipmiconsole.8* %{_mandir}/man5/ipmiconsole.conf.5* +%{_mandir}/man8/ipmimonitoring.8* %{_mandir}/man8/ipmi-chassis.8* %{_mandir}/man3/libipmidetect.3* %{_mandir}/man8/ipmidetect.8* %{_mandir}/man5/ipmidetect.conf.5* +%dir %{_localstatedir}/cache/ipmimonitoringsdrcache %files devel %defattr(-,root,root) @@ -272,6 +268,7 @@ fi %defattr(-,root,root) %doc %{_datadir}/doc/%{name}/COPYING.bmc-watchdog %doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog +%doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog.UC %{_initrddir}/freeipmi-bmc-watchdog %config(noreplace) %{_sysconfdir}/sysconfig/freeipmi-bmc-watchdog %config(noreplace) %{_sysconfdir}/logrotate.d/freeipmi-bmc-watchdog @@ -279,16 +276,6 @@ fi %{_mandir}/man8/bmc-watchdog.8* %dir %{_localstatedir}/log/freeipmi -%files ipmimonitoring -%defattr(-,root,root) -%doc %{_datadir}/doc/%{name}/COPYING.ipmimonitoring -%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring -%attr(0444,root,root) %config(noreplace) %{_sysconfdir}/ipmi_monitoring_sensors.conf -%{_libdir}/libipmimonitoring.so.* -%{_sbindir}/ipmimonitoring -%{_mandir}/man8/ipmimonitoring.8* -%dir %{_localstatedir}/cache/ipmimonitoringsdrcache - %files ipmidetectd %defattr(-,root,root) %{_initrddir}/freeipmi-ipmidetectd @@ -297,6 +284,12 @@ fi %{_mandir}/man8/ipmidetectd.8* %changelog +* Tue Dec 18 2007 Phil Knirsch 0.5.1-1 +- Update to freeipmi-0.5.1 + +* Wed Nov 19 2007 Albert Chu 0.5.0 +- Remove ipmimonitoring subpackage. Merge into head package. + * Wed Nov 07 2007 Phil Knirsch 0.4.6-3.fc7 - More fixes for Fedora Review: o Added ExclusiveArch due to missing lopl (#368541) diff --git a/sources b/sources index 5436399..36681a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf7f0ea413b833e77775501dfd97d4c5 freeipmi-0.4.6.tar.gz +d22287bd4894762ab73ac9686c23e622 freeipmi-0.5.1.tar.gz