[ipmiutil] spec file fixups for devel pkg (ipmiutil-2.8.3-2)
arcress
arcress at fedoraproject.org
Fri Jun 1 22:24:02 UTC 2012
commit 9bddebfad72705f94a7addfabec96ea1a964230c
Author: Andy Cress <arcress at users.sourceforge.net>
Date: Fri Jun 1 18:22:49 2012 -0400
spec file fixups for devel pkg (ipmiutil-2.8.3-2)
ipmiutil.spec | 116 +++++++++++++++++++++-----------------------------------
1 files changed, 44 insertions(+), 72 deletions(-)
---
diff --git a/ipmiutil.spec b/ipmiutil.spec
index a53f291..bb2050e 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -4,27 +4,20 @@
#
Name: ipmiutil
Version: 2.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Easy-to-use IPMI server management utilities
License: BSD
-Group: System/Management
+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)
+# Suggests: cron or vixie-cron or cronie or similar
%if 0%{?fedora} >= 15
Requires: systemd-units
%endif
-%if 0%{?req_systemd}
-BuildRequires: openssl-devel gcc gcc-c++ libtool systemd
-%define systemd_fls %{_unitdir}
-# Requires: %{?systemd_requires}
-%else
BuildRequires: openssl-devel gcc gcc-c++ libtool
-%define systemd_fls %{_datadir}/%{name}
-%endif
-# Suggests: cron or vixie-cron or cronie or similar
-
-%define init_dir %{_initrddir}
+%global systemd_fls %{_datadir}/%{name}
+%global init_dir %{_initrddir}
%description
The ipmiutil package provides easy-to-use utilities to view the SEL,
@@ -39,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/C and C++
+Group: Development/Libraries
Summary: Includes libraries and headers for the ipmiutil package
-Requires: ipmiutil
+Provides: ipmiutil-static = %{version}-%{release}
%description devel
The ipmiutil-devel package contains headers and libraries which are
@@ -51,12 +44,8 @@ useful for building custom IPMI applications.
%setup -q
%build
-%if 0%{?req_systemd}
-%configure --enable-systemd
-%else
%configure
-%endif
-make
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -136,18 +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
-%if 0%{?req_systemd}
-%service_add_pre ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
-%endif
%post
# POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U
@@ -158,24 +142,20 @@ then
vardir=%{_var}/lib/%{name}
scr_dir=%{_datadir}/%{name}
-%if 0%{?req_systemd}
-%service_add_post ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
-%else
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
-%endif
# Run some ipmiutil command to see if any IPMI interface works.
%{_bindir}/ipmiutil sel -v >/dev/null 2>&1
@@ -211,24 +191,21 @@ fi
# before uninstall, $1 = 1 if rpm -U, $1 = 0 if rpm -e
if [ "$1" = "0" ]
then
-%if 0%{?req_systemd}
-%service_del_preun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
-%else
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
@@ -243,21 +220,17 @@ 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
-%endif
if [ -f %{_sysconfdir}/cron.daily/checksel ]; then
- rm -f %{_sysconfdir}/cron.daily/checksel
+ rm -f %{_sysconfdir}/cron.daily/checksel
fi
fi
%postun
-%if 0%{?req_systemd}
-%service_del_postun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
-%else
if [ -x /bin/systemctl ]; then
systemctl daemon-reload || :
if [ $1 -ge 1 ] ; then
@@ -265,17 +238,16 @@ if [ -x /bin/systemctl ]; then
systemctl try-restart ipmi_port.service || :
fi
fi
-%endif
%changelog
+* Fri May 04 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.3-2
+ 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
+ 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
More information about the scm-commits
mailing list