From e71475949c6db36573c3218e26909671a66773c6f43b2b8b638b6249c81a8704 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Fri, 29 Jun 2018 12:54:20 +0000
Subject: [PATCH] Accepting request 619768 from
 home:jmoellers:branches:systemsmanagement

OBS-URL: https://build.opensuse.org/request/show/619768
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=47
---
 ipmitool.changes |  6 ++++++
 ipmitool.spec    | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/ipmitool.changes b/ipmitool.changes
index 8f595d5..7dafb83 100644
--- a/ipmitool.changes
+++ b/ipmitool.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 28 14:58:47 UTC 2018 - josef.moellers@suse.com
+
+- Make bmc-snmp-proxy into a (sub)package of its own.
+  [fate#322044, ipmitool.spec]
+
 -------------------------------------------------------------------
 Fri Oct  6 13:26:36 UTC 2017 - josef.moellers@suse.com
 
diff --git a/ipmitool.spec b/ipmitool.spec
index b5ca699..535b46b 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -35,7 +35,6 @@ BuildRequires:  libtool
 BuildRequires:  openssl-devel
 BuildRequires:  readline-devel
 BuildRequires:  systemd-rpm-macros
-Requires:       net-snmp
 %{?systemd_requires}
 
 %description
@@ -54,6 +53,17 @@ displaying sensor values, displaying the contents of the System Event
 Log (SEL), printing Field Replaceable Unit (FRU) information, reading
 and setting LAN configuration, and chassis power control.
 
+%package bmc-snmp-proxy
+
+Summary:        Reconfigure SNMP to include host SNMP agent within BMC
+Group:		System/Management
+Requires:	net-snmp, ipmitool >= %{version}
+BuildArch:	noarch
+
+%description bmc-snmp-proxy
+Given a host with BMC, this package would extend system configuration
+of net-snmp to include redirections to BMC based SNMP.
+
 %prep
 %setup -q
 %autopatch -p1
@@ -87,15 +97,27 @@ install -D -m 755 contrib/bmc-snmp-proxy.sysconf %{buildroot}/%{_sysconfdir}/bmc
 ln -sf service %{buildroot}%{_sbindir}/rcbmc-snmp-proxy
 
 %pre
-%service_add_pre bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
+%service_add_pre exchange-bmc-os-info.service ipmievd.service
 
 %post
-%service_add_post bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
+%service_add_post exchange-bmc-os-info.service ipmievd.service
 
 %preun
-%service_del_preun bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
+%service_del_preun exchange-bmc-os-info.service ipmievd.service
 
 %postun
+%service_del_postun exchange-bmc-os-info.service ipmievd.service
+
+%pre bmc-snmp-proxy
+%service_add_pre bmc-snmp-proxy.service
+
+%post bmc-snmp-proxy
+%service_add_post bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
+
+%preun bmc-snmp-proxy
+%service_del_preun bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
+
+%postun bmc-snmp-proxy
 %service_del_postun bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service
 
 %files
@@ -104,17 +126,19 @@ ln -sf service %{buildroot}%{_sbindir}/rcbmc-snmp-proxy
 %attr(755,root,root) %{_bindir}/ipmitool
 %attr(755,root,root) %{_sbindir}/ipmievd
 %attr(755,root,root) %{_sbindir}/exchange-bmc-os-info
-%attr(755,root,root) %{_sbindir}/bmc-snmp-proxy
 %{_sbindir}/rcipmievd
 %{_sbindir}/rcexchange-bmc-os-info
-%{_sbindir}/rcbmc-snmp-proxy
 %config(noreplace) %{_sysconfdir}/exchange-bmc-os-info
-%config(noreplace) %{_sysconfdir}/bmc-snmp-proxy
 %config(noreplace) %{_sysconfdir}/ipmievd
 %{_unitdir}/exchange-bmc-os-info.service
 %{_unitdir}/ipmievd.service
-%{_unitdir}/bmc-snmp-proxy.service
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
+%files bmc-snmp-proxy
+%attr(755,root,root) %{_sbindir}/bmc-snmp-proxy
+%{_sbindir}/rcbmc-snmp-proxy
+%config(noreplace) %{_sysconfdir}/bmc-snmp-proxy
+%{_unitdir}/bmc-snmp-proxy.service
+
 %changelog