From 6d00a3ce4bf52f210f4d9d8f13b03284650bb00394f8cfe929a12306c156510e Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Wed, 6 Oct 2021 04:16:57 +0000
Subject: [PATCH] - Install mdadm in _sbindir rather than /sbin.  This is more 
  appropriate now that we have a merged-/usr.   (bsc#1191076)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=200
---
 mdadm.changes |  7 +++++++
 mdadm.spec    | 11 ++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mdadm.changes b/mdadm.changes
index 53b60f3..af59de9 100644
--- a/mdadm.changes
+++ b/mdadm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  6 04:15:49 UTC 2021 - Neil Brown <nfbrown@suse.com>
+
+- Install mdadm in _sbindir rather than /sbin.  This is more
+  appropriate now that we have a merged-/usr.
+  (bsc#1191076)
+
 -------------------------------------------------------------------
 Thu Sep  2 05:17:18 UTC 2021 - Coly Li <colyli@suse.com>
 
diff --git a/mdadm.spec b/mdadm.spec
index 7151a40..defd23d 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -31,7 +31,9 @@ BuildRequires:  sgmltool
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
-PreReq:         %fillup_prereq /sbin/mkinitrd coreutils
+PreReq:         %fillup_prereq
+PreReq:         /sbin/mkinitrd
+PreReq:         coreutils
 Recommends:     smtp_daemon
 URL:            http://www.kernel.org/pub/linux/utils/raid/mdadm/
 Summary:        Utility for configuring "MD" software RAID devices
@@ -287,13 +289,13 @@ mdadm is a program that can be used to control Linux md devices.
 %patch1003 -p1
 
 %build
-make %{?_smp_mflags} CC="%__cc" CXFLAGS="%{optflags} -Wno-error" SUSE=yes
+make %{?_smp_mflags} CC="%__cc" CXFLAGS="%{optflags} -Wno-error" SUSE=yes BINDIR=%{_sbindir}
 cd Software-RAID.HOWTO
 sgml2html Software-RAID.HOWTO.sgml
 sgml2txt Software-RAID.HOWTO.sgml
 
 %install
-%make_install install-systemd install-udev SYSTEMD_DIR=%{_unitdir} UDEVDIR=%{_udevdir} SUSE=yes
+%make_install install-systemd install-udev SYSTEMD_DIR=%{_unitdir} UDEVDIR=%{_udevdir} SUSE=yes BINDIR=%{_sbindir}
 rm -rf %{buildroot}/lib/udev
 install -d %{buildroot}%{_fillupdir}
 install -d %{buildroot}/usr/share/mdadm
@@ -329,8 +331,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmdmonitor
 %doc ChangeLog README.initramfs TODO mdadm.conf-example mkinitramfs
 %doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html}
 %doc %{_mandir}/man?/*
-/sbin/*
-%{_sbindir}/rcmdmonitor
+%{_sbindir}/*
 %dir /usr/share/mdadm
 /usr/share/mdadm/*
 %{_fillupdir}/sysconfig.mdadm