From 2285dca03ed939eb12854452d413fd5030e027d71b6cf4c92a5d8c3978dddf2f Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 26 Nov 2020 10:09:40 +0000
Subject: [PATCH] Accepting request 849586 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849586
OBS-URL: https://build.opensuse.org/package/show/filesystems/davfs2?expand=0&rev=25
---
 davfs2.changes | 5 +++++
 davfs2.spec    | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/davfs2.changes b/davfs2.changes
index a3f662e..bf3d5ad 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:53:05 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Wed Sep 16 12:24:56 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/davfs2.spec b/davfs2.spec
index 92169f2..8d6f4b1 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -51,10 +51,12 @@ supporting TLS/SSL and access via proxy servers.
 cd src
 
 %build
-ssbindir="%{_sbindir}" \
 dav_user="%{name}" \
 dav_group="%{name}" \
 %configure \
+%if 0%{?usrmerged}
+    ssbindir="%{_sbindir}" \
+%endif
     --disable-static
 %if 0%{?suse_version} >= 1000
 PIE="-fPIE"
@@ -105,7 +107,9 @@ rm -rf "%{buildroot}/%{_docdir}"
 %{_sbindir}/umount.davfs
 %{_datadir}/%{name}
 %attr(0750, %{name}, %{name}) %{_localstatedir}/cache/%{name}
+%if !0%{?usrmerged}
 /sbin/mount.davfs
 /sbin/umount.davfs
+%endif
 
 %changelog