From c90a67282d911a4b143d51b6d1f909777d35e5d4acb1ef19ac3f5d47f1b3135a Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Mon, 24 Oct 2022 12:23:47 +0000
Subject: [PATCH] Accepting request 1030865 from
 home:lnussel:branches:server:monitoring

- UsrMerge: move stuff from /sbin to /usr/sbin (boo#1191080)

OBS-URL: https://build.opensuse.org/request/show/1030865
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=72
---
 munin.changes |  5 +++++
 munin.spec    | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/munin.changes b/munin.changes
index 055f259..005402f 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 24 11:04:04 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
+
+- UsrMerge: move stuff from /sbin to /usr/sbin (boo#1191080)
+
 -------------------------------------------------------------------
 Sun Feb 20 10:39:50 UTC 2022 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/munin.spec b/munin.spec
index 13c6489..97142cc 100644
--- a/munin.spec
+++ b/munin.spec
@@ -171,10 +171,10 @@ unzip %{SOURCE13}
 
 %__install -m0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d/munin-node
 
-%__mkdir_p %{buildroot}/sbin
-%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-node
-%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-graph
-%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-html
+%__mkdir_p %{buildroot}%{_sbindir}
+%__ln_s service $RPM_BUILD_ROOT%{_sbindir}/rcmunin-node
+%__ln_s service $RPM_BUILD_ROOT%{_sbindir}/rcmunin-cgi-graph
+%__ln_s service $RPM_BUILD_ROOT%{_sbindir}/rcmunin-cgi-html
 
 %__mkdir_p %{buildroot}/%{_prefix}/lib/tmpfiles.d
 %__install -m0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/tmpfiles.d/munin.conf
@@ -301,8 +301,8 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_prefix}/lib/tmpfiles.d/munin.conf
 %{_unitdir}/munin-cgi-graph.service
 %{_unitdir}/munin-cgi-html.service
-/sbin/rcmunin-cgi-graph
-/sbin/rcmunin-cgi-html
+%{_sbindir}/rcmunin-cgi-graph
+%{_sbindir}/rcmunin-cgi-html
 %if 0%{?suse_version} > 1510
 %{_unitdir}/munin-cron.*
 %else
@@ -375,7 +375,7 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_prefix}/lib/munin/munin-async
 %{_prefix}/lib/munin/munin-asyncd
 %{_prefix}/lib/munin/plugins/
-/sbin/rcmunin-node
+%{_sbindir}/rcmunin-node
 %dir %{_sysconfdir}/munin/plugin-conf.d
 %dir %{_sysconfdir}/munin/plugins
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/munin-node