From 01fd92d3ee047498115bea2763d78800e1d658dda50cfde450f9043ef494eaaa Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Fri, 20 Nov 2020 12:13:05 +0000
Subject: [PATCH] Accepting request 849592 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849592
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=102
---
 drbd-utils.changes |  5 +++++
 drbd-utils.spec    | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/drbd-utils.changes b/drbd-utils.changes
index efa3c48..4afa157 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 16:01:34 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Oct 12 12:12:12 UTC 2020 - ohering@suse.de
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index 9ced66a..b2161bd 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+%if !0%{?usrmerged}
+%define sbindir /sbin
+%else
+%define sbindir %{_sbindir}
+%endif
 
 %bcond_without drbdmon
 # Man pages are included in the released tarball.
@@ -96,8 +101,12 @@ PATH=/sbin:$PATH ./configure \
     --with-bashcompletion \
     --with-initscripttype=systemd \
     --with-systemdunitdir=%{_prefix}/lib/systemd/system \
+%if !0%{?usrmerged}
     --prefix=/ \
     --sbindir=/sbin \
+%else
+    --prefix=%{_prefix} \
+%endif
     --libdir=%{_prefix}/lib \
     --mandir=%{_mandir} \
     --sysconfdir=%{_sysconfdir} \
@@ -162,11 +171,11 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
 %dir %{_sysconfdir}/drbd.d
 %dir %{_sysconfdir}/multipath
 %dir %{_sysconfdir}/multipath/conf.d
-/sbin/drbdadm
-/sbin/drbdsetup
-/sbin/drbdmeta
+%{sbindir}/drbdadm
+%{sbindir}/drbdsetup
+%{sbindir}/drbdmeta
 %if %{with drbdmon}
-/sbin/drbdmon
+%{sbindir}/drbdmon
 %endif
 %ifarch %{ix86} x86_64
 %dir %attr(700,root,root) %{_sysconfdir}/xen