From 5c3540dbbcbf86f4c1ab5711fc0fd58c914186c667388c3a6765e2b0516234ff Mon Sep 17 00:00:00 2001
From: Aurelien Aptel <aaptel@suse.com>
Date: Fri, 20 Nov 2020 11:29:53 +0000
Subject: [PATCH] Accepting request 849576 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849576
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=184
---
 cifs-utils.changes | 5 +++++
 cifs-utils.spec    | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/cifs-utils.changes b/cifs-utils.changes
index a6e955b..8fd829b 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:42:23 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Aug 10 06:56:11 UTC 2020 - Aurelien Aptel <aaptel@suse.com>
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 7b42ab8..a4400d3 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -139,6 +139,9 @@ cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"
 export LDFLAGS="-pie"
 autoreconf -i
+%if 0%{?usrmerged}
+export ROOTSBINDIR="%{_sbindir}"
+%endif
 %configure \
 	--with-pamdir=/%{_lib}/security
 make %{?_smp_mflags}
@@ -175,7 +178,11 @@ touch %{buildroot}/%{_sysconfdir}/sysconfig/network/if-{down,up}.d/${script} \
 %endif
 
 %files
+%if 0%{?usrmerged}
+%{_sbindir}/mount.cifs
+%else
 /sbin/mount.cifs
+%endif
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap