From 48c76969581060ef73a7a3c02914f5e66a6e674d Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Mon, 27 Dec 2021 20:00:16 +0800
Subject: [PATCH] separate exchange-bmc-os-info,bmc-snmp-proxy from ipmitool

---
 ipmitool.spec | 64 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/ipmitool.spec b/ipmitool.spec
index 38b198a..2e94907 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -1,6 +1,6 @@
 Name:            ipmitool
 Version:         1.8.18
-Release:         17
+Release:         18
 Summary:         Utility for IPMI control
 License:         BSD
 URL:             http://ipmitool.sourceforge.net/
@@ -47,16 +47,39 @@ BuildRequires:    openssl-devel readline-devel ncurses-devel
 %{?systemd_requires}
 BuildRequires:   systemd
 BuildRequires:   automake autoconf libtool
-Requires:        net-snmp hostname
 Obsoletes:       OpenIPMI-tools < 2.0.14-3
 Provides:        OpenIPMI-tools = 2.0.14-3
-Obsoletes:       ipmievd bmc-snmp-proxy exchange-bmc-os-info
-Provides:        ipmievd bmc-snmp-proxy exchange-bmc-os-info
+Obsoletes:       ipmievd
+Provides:        ipmievd
 
 %description
 This package provides a simple command-line interface to IPMI-enabled devices 
 through an IPMIv1.5 or IPMIv2.0 LAN interface or Linux/Solaris kernel driver.
 
+%package -n bmc-snmp-proxy
+Requires: net-snmp
+Requires: exchange-bmc-os-info
+BuildArch: noarch
+Summary: Reconfigure SNMP to include host SNMP agent within BMC
+
+%description -n bmc-snmp-proxy
+Given a host with BMC, this package would extend system configuration
+of net-snmp to include redirections to BMC based SNMP.
+
+
+%package -n exchange-bmc-os-info
+Requires: hostname
+Requires: ipmitool
+BuildArch: noarch
+%{?systemd_requires}
+BuildRequires: systemd
+Summary: Let OS and BMC exchange info
+
+%description -n exchange-bmc-os-info
+Given a host with BMC, this package would pass the hostname &
+OS information to the BMC and also capture the BMC ip info
+for the host OS to use.
+
 %package_help
 
 %prep
@@ -99,14 +122,20 @@ install -Dm 755 contrib/bmc-snmp-proxy         %{buildroot}%{_libexecdir}/bmc-sn
 
 %post
 %systemd_post ipmievd.service
-%systemd_post exchange-bmc-os-info.service
 
 %preun
 %systemd_preun ipmievd.service
-%systemd_preun exchange-bmc-os-info.service
 
 %postun
 %systemd_postun_with_restart ipmievd.service
+
+%post -n exchange-bmc-os-info
+%systemd_post exchange-bmc-os-info.service
+
+%preun -n exchange-bmc-os-info
+%systemd_preun exchange-bmc-os-info.service
+
+%postun -n exchange-bmc-os-info
 %systemd_postun_with_restart exchange-bmc-os-info.service
 
 %triggerun -- %{name}
@@ -117,14 +146,23 @@ install -Dm 755 contrib/bmc-snmp-proxy         %{buildroot}%{_libexecdir}/bmc-sn
 %files
 %doc %{_datadir}/doc/ipmitool/AUTHORS
 %doc %{_datadir}/doc/ipmitool/COPYING
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-%{_sysconfdir}/profile.d/set-bmc-url.sh
+%config(noreplace) %{_sysconfdir}/sysconfig/ipmievd
 %{_bindir}/ipmitool
 %{_sbindir}/ipmievd
-%{_unitdir}/*.service
-%{_libexecdir}/*
+%{_unitdir}/ipmievd.service
 %{_datadir}/ipmitool
 
+%files -n exchange-bmc-os-info
+%config(noreplace) %{_sysconfdir}/sysconfig/exchange-bmc-os-info
+%{_sysconfdir}/profile.d/set-bmc-url.sh
+%{_unitdir}/exchange-bmc-os-info.service
+%{_libexecdir}/exchange-bmc-os-info
+
+%files -n bmc-snmp-proxy
+%config(noreplace) %{_sysconfdir}/sysconfig/bmc-snmp-proxy
+%{_unitdir}/bmc-snmp-proxy.service
+%{_libexecdir}/bmc-snmp-proxy
+
 %files help
 %doc %{_datadir}/doc/ipmitool/README
 %doc %{_datadir}/doc/ipmitool/ChangeLog
@@ -132,6 +170,12 @@ install -Dm 755 contrib/bmc-snmp-proxy         %{buildroot}%{_libexecdir}/bmc-sn
 %{_mandir}/man8/ipmievd.8*
 
 %changelog
+* Mon Dec 27 2021 gaihuiying <gaihuiying1@huawei.com> - 1.8.18-18
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:separate exchange-bmc-os-info,bmc-snmp-proxy from ipmitool
+
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.8.18-17
 - DESC: delete -S git from %autosetup, and delete BuildRequires git
 
-- 
Gitee