diff --git a/SOURCES/openipmi.sysconf b/SOURCES/openipmi.sysconf deleted file mode 100644 index 715c6e4..0000000 --- a/SOURCES/openipmi.sysconf +++ /dev/null @@ -1,68 +0,0 @@ -## Path: Hardware/IPMI -## Description: Enable standard hardware interfaces (KCS, BT, SMIC) -## Type: yesno -## Default: "yes" -## Config: ipmi -# Enable standard hardware interfaces (KCS, BT, SMIC) -# You probably want this enabled. -IPMI_SI=yes - -## Path: Hardware/IPMI -## Description: Enable /dev/ipmi0 interface, used by ipmitool, ipmicmd, -## Type: yesno -## Default: "yes" -## Config: ipmi -# Enable /dev/ipmi0 interface, used by ipmitool, ipmicmd, -# and other userspace IPMI-using applications. -# You probably want this enabled. -DEV_IPMI=yes - -## Path: Hardware/IPMI -## Description: Enable IPMI_WATCHDOG if you want the IPMI watchdog -## Type: yesno -## Default: "no" -## Config: ipmi -# Enable IPMI_WATCHDOG if you want the IPMI watchdog -# to reboot the system if it hangs -IPMI_WATCHDOG=no - -## Path: Hardware/IPMI -## Description: Watchdog options - modinfo ipmi_watchdog for details -## Type: string -## Default: "timeout=60" -## Config: ipmi -# Watchdog options - modinfo ipmi_watchdog for details -# watchdog timeout value in seconds -# as there is no userspace ping application that runs during shutdown, -# be sure to give it enough time for any device drivers to -# do their cleanup (e.g. megaraid cache flushes) -# without the watchdog triggering prematurely -IPMI_WATCHDOG_OPTIONS="timeout=60" - -## Path: Hardware/IPMI -## Description: Enable IPMI_POWEROFF if you want the IPMI poweroff module to be loaded. -## Type: yesno -## Default: "no" -## Config: ipmi -# Enable IPMI_POWEROFF if you want the IPMI -# poweroff module to be loaded. -IPMI_POWEROFF=no - -## Path: Hardware/IPMI -## Description: Enable IPMI_POWERCYCLE if you want the system to be power-cycled on reboot -## Type: yesno -## Default: "no" -## Config: ipmi -# Enable IPMI_POWERCYCLE if you want the system to be power-cycled (power -# down, delay briefly, power on) rather than power off, on systems -# that support such. IPMI_POWEROFF=yes is also required. -IPMI_POWERCYCLE=no - -## Path: Hardware/IPMI -## Description: Enable "legacy" interfaces for applications -## Type: yesno -## Default: "no" -## Config: ipmi -# Enable "legacy" interfaces for applications -# Intel IMB driver interface -IPMI_IMB=no diff --git a/SPECS/OpenIPMI.spec b/SPECS/OpenIPMI.spec index 176a264..02885dd 100644 --- a/SPECS/OpenIPMI.spec +++ b/SPECS/OpenIPMI.spec @@ -4,10 +4,10 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -%global once %{_localstatedir}/run/%{name}/first_installation +%global once %{_localstatedir}/run/%{name}.first_installation Version: 2.0.19 -Release: 11%{?dist} +Release: 15%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -128,9 +128,8 @@ install -d ${RPM_BUILD_ROOT}%{_libexecdir} install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper install -d ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service -install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d -install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf -install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name} +install -d ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d +install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d/OpenIPMI.conf rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 @@ -168,9 +167,11 @@ fi %postun %systemd_postun_with_restart ipmi.service -%post libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig -%postun libs -p /sbin/ldconfig +%postun libs +/sbin/ldconfig ### A sysv => systemd migration contains all of the same scriptlets as a ### systemd package. These are additional scriptlets @@ -225,10 +226,27 @@ fi %{_libdir}/pkgconfig/*.pc %files modalias -%config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf -%{_localstatedir}/run/%{name} +%config(noreplace) %{_prefix}/lib/modprobe.d/OpenIPMI.conf %changelog +* Thu Jun 02 2016 Boris Ranto - 2.0.19-15 +- Fix once macro, /var/run/OpenIPMI/ no longer exists +- Resolves: rhbz#1341735 + +* Wed Mar 16 2016 Boris Ranto - 2.0.19-14 +- Fix a typo in install phase (%% -> %) +- Resolves: rhbz#1195289 + +* Wed Mar 16 2016 Boris Ranto - 2.0.19-13 +- Fix the location of modprode.d config (lib64 -> lib on 64-bit platforms) +- Resolves: rhbz#1195289 + +* Wed Dec 09 2015 Boris Ranto - 2.0.19-12 +- New release +- Move OpenIPMI modprobe conf to /usr/lib/modprobe.d/ (#1195289) +- Avoid warning on update/removal (#1256798) +- Stop manually creating and shipping /var/run/OpenIPMI (#1296560) + * Fri Jan 24 2014 Daniel Mach - 2.0.19-11 - Mass rebuild 2014-01-24