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

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849603
OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=77
---
 fuse.changes |  5 +++++
 fuse.spec    | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/fuse.changes b/fuse.changes
index dde071f..2722cbb 100644
--- a/fuse.changes
+++ b/fuse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 10 10:52:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Sun Aug 16 15:15:40 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/fuse.spec b/fuse.spec
index 5b00c7c..c8dbc77 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -177,7 +177,7 @@ install -m644 -D util/udev.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/99-fus
 find %{buildroot} -type f -name "*.la" -delete -print
 # not needed for fuse, might reappar in separate package:
 rm -f %{buildroot}/%{_libdir}/libulockmgr.a
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir %{buildroot}/sbin
 mkdir %{buildroot}/%{_lib}
 ln -s -v %{_sbindir}/mount.fuse %{buildroot}/sbin
@@ -186,7 +186,7 @@ for libname in $(ls *.so.*);do
 ln -s -v /%{_libdir}/$libname %{buildroot}/%{_lib}
 done
 popd
-#EndUsrMerge
+%endif
 
 (cd example && make clean)
 rm -rf example/.deps example/Makefile.am example/Makefile.in
@@ -216,9 +216,9 @@ rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile
 %{_sysconfdir}/udev/rules.d/99-fuse.rules
 %endif
 %verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount
-#UsrMerge
+%if !0%{?usrmerged}
 /sbin/mount.fuse
-#EndUsrMerge
+%endif
 %{_sbindir}/mount.fuse
 %config %{_sysconfdir}/fuse.conf
 %{_bindir}/ulockmgr_server
@@ -227,15 +227,15 @@ rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile
 %{_mandir}/man8/mount.fuse.8%{?ext_man}
 
 %files -n libfuse2
-#UsrMerge
+%if !0%{?usrmerged}
 /%{_lib}/libfuse.so.2*
-#EndUsrMerge
+%endif
 %{_libdir}/libfuse.so.2*
 
 %files -n libulockmgr1
-#UsrMerge
+%if !0%{?usrmerged}
 /%{_lib}/libulockmgr.so.*
-#EndUsrMerge
+%endif
 %{_libdir}/libulockmgr.so.*
 
 %files doc