Hello community,

here is the log from the commit of package fuse for openSUSE:Factory checked in 
at 2020-11-29 12:20:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fuse (Old)
 and      /work/SRC/openSUSE:Factory/.fuse.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fuse"

Sun Nov 29 12:20:36 2020 rev:72 rq:850977 version:2.9.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/fuse/fuse.changes        2020-08-19 
18:48:08.067570113 +0200
+++ /work/SRC/openSUSE:Factory/.fuse.new.5913/fuse.changes      2020-11-29 
12:20:39.545530702 +0100
@@ -1,0 +2,5 @@
+Tue Nov 10 10:52:32 UTC 2020 - Ludwig Nussel <[email protected]>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fuse.spec ++++++
--- /var/tmp/diff_new_pack.gFX87t/_old  2020-11-29 12:20:40.301531467 +0100
+++ /var/tmp/diff_new_pack.gFX87t/_new  2020-11-29 12:20:40.301531467 +0100
@@ -177,7 +177,7 @@
 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 @@
 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 @@
 %{_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 @@
 %{_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
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/[email protected]

Reply via email to