Accepting request 850978 from filesystems

OBS-URL: https://build.opensuse.org/request/show/850978
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/davfs2?expand=0&rev=5

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>
 

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