Accepting request 715641 from filesystems

OBS-URL: https://build.opensuse.org/request/show/715641
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse3?expand=0&rev=6

conf-rename.patch

@@ -0,0 +1,23 @@
+Index: fuse-3.6.2/util/install_helper.sh
+===================================================================
+--- fuse-3.6.2.orig/util/install_helper.sh
++++ fuse-3.6.2/util/install_helper.sh
+@@ -24,7 +24,7 @@ else
+ fi
+ 
+ install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
+-	"${DESTDIR}${sysconfdir}/fuse.conf"
++	"${DESTDIR}${sysconfdir}/fuse3.conf"
+ 
+ if $useroot; then
+     chown root:root "${DESTDIR}${bindir}/fusermount3"
+Index: fuse-3.6.2/util/meson.build
+===================================================================
+--- fuse-3.6.2.orig/util/meson.build
++++ fuse-3.6.2/util/meson.build
+@@ -1,4 +1,4 @@
+-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
++fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse3.conf')
+ 
+ executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'],
+            include_directories: include_dirs,

fuse-3.6.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6dc3b702f2d13187ff4adb8bcbdcb913ca0510ce0020e4d87bdeb4d794173704
-size 1168980

fuse-3.6.1.tar.xz.asc

@@ -1,19 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQK3BAABCgChFiEE7TF5GyxcFhOvOIuK0RP8rDxOWZ8FAl0CXNNfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVE
-MzE3OTFCMkM1QzE2MTNBRjM4OEI4QUQxMTNGQ0FDM0M0RTU5OUYjGmh0dHA6Ly93
-d3cucmF0aC5vcmcvZ3BncG9saWN5Lmh0bWwACgkQ0RP8rDxOWZ/m6A/8CuxUNNB0
-4iucMkM26Yx255CwloJyFi4T+t16kM/95NaBOOFnYj8WsXW6afKFjuDgu+xOoAWJ
-/KsEOW5iw5UkLSjLU1W/cMk6079jWpgUe95Fgb6FJ5pTHrqIAcwLuF4M4mV4b1CH
-f3omrX9wyWFlJxMEoM6gseHbYaRDp7uDvhgVNu4SwQyPGnKweqJKdoEj2+EJFjkD
-Zt7ceRknRAL1AhBf25qRhFwFZnweyKo39Rzyk8SWBN2GejmPUHFo7vAr0dL4TV0G
-J5saOQWclU06TBzMAJ2qTn8Btuv+Kf2IG4Kq2jDlzrYI2wf8QAoahhMLLUI96+VH
-duSD/zh0Kva8XvQ4LUisAekxxPnolgHp06wsf6Ws3anPAigh3EiNxOFcqzIFX4iF
-xLd+a0P6xLH0iumzNIrtEy/TOFENvcrZy71uG+xFkGJZijYTTiqxmdaRHygENErk
-pc/vVMZQWs9UVoptPWlSeybL1Icl0L1AFgt2obAd6X6T7Ku5steswR9Mhz+4mXCC
-vVSez4+g50vUJ2JqpmZvRrI3UOk/TLsdJddpPM4aNVlyOJwtxAoRFqFavd/udZV2
-WzvtavRYHuCKUmebevcj8uMaEIUupVIY57FlB9UgGciyYtgeILs3rl2m97Jm+4va
-YLZZ+zSmlUj7SRDXD7cjIJK3WZHBdxC2Ctk=
-=Mqp5
------END PGP SIGNATURE-----

fuse-3.6.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281
+size 1255556

fuse-3.6.2.tar.xz.asc

@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQK3BAABCgChFiEE7TF5GyxcFhOvOIuK0RP8rDxOWZ8FAl0kinBfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVE
+MzE3OTFCMkM1QzE2MTNBRjM4OEI4QUQxMTNGQ0FDM0M0RTU5OUYjGmh0dHA6Ly93
+d3cucmF0aC5vcmcvZ3BncG9saWN5Lmh0bWwACgkQ0RP8rDxOWZ9LRBAAiW4mIRcB
+kxSFcep7Pb7uHE8avNTOOcPSeP6Z/3DVW52ag/zZhdyFUpQxrTtakr38hieYAdpL
+S5atQ/QGFM8OC69+aHAmmL6HttGlWoebinvFEO4shUpvSud8SyyYJQRC39C1wMIv
++ecO3yXH4GIKnyEAec11pvQJ5Toq1iNMTCiPsGBLWJHdszqTT5I/jdFMri8Sv4pu
+Ar11zo1cn2d4qV8aw/wf/Kjalz7t2MzHfzCPCdh2fZnjicbFZsqlGGohMZWIVLOZ
+Ygt9KYvCunXot7GGphmzLA3/akBtm5JTYKAKtGDvv3f7QjCLTgyeoHvglNPA4j1n
+x2Kj1GTzJN4LjGq4WwkUHCFox28rZz5uVfvo3aT6+UYh/st3/KEDfBszEo8TcAj3
+8snHPTisj/UjKqmOxwZh5mSiS4Rwf2ejRWSanKKflb257bFj//KIjSirDM18w3uB
+1/K4KOQjcjidbpcCViowrLLZaXw/uCPavSwfLmqwz2pU0QI5awZxSyiLrQNsJduP
+N3K9N5rbCN8gecRDZyoY/vwVShbJYi/ewaf70+q7M6THBMTHQEcA1J6h6LBvImIF
+MsBhpOgIz7qnadOxyGfqTwn/ypOLXWYj9e1oBXOh+DIMxkp96k0w1rbDDthSt2L/
+f53qrYmyY8Joli+MGy3qHzlxbQOCtAGn9Lc=
+=dRJN
+-----END PGP SIGNATURE-----

fuse-install-fix.patch

@@ -1,46 +0,0 @@
-Index: fuse-3.3.0/util/install_helper.sh
-===================================================================
---- fuse-3.3.0.orig/util/install_helper.sh
-+++ fuse-3.3.0/util/install_helper.sh
-@@ -22,30 +22,6 @@ else
-     DESTDIR="${DESTDIR%/}"
- fi
- 
--chown root:root "${DESTDIR}${bindir}/fusermount3"
--chmod u+s "${DESTDIR}${bindir}/fusermount3"
--
- install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
--	"${DESTDIR}${sysconfdir}/fuse.conf"
--
--
--if test ! -e "${DESTDIR}/dev/fuse"; then
--    mkdir -p "${DESTDIR}/dev"
--    mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
--fi
--
--install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
--        "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
--
--install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
--        "${DESTDIR}${sysconfdir}/init.d/fuse3"
--
--
--if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
--    /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
--else
--    echo "== FURTHER ACTION REQUIRED =="
--    echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
--fi
--
-+	"${DESTDIR}${sysconfdir}/fuse3.conf"
- 
-Index: fuse-3.3.0/util/meson.build
-===================================================================
---- fuse-3.3.0.orig/util/meson.build
-+++ fuse-3.3.0/util/meson.build
-@@ -1,4 +1,4 @@
--fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
-+fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse3.conf')
- 
- executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'],
-            include_directories: include_dirs,

fuse3.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jul  9 12:47:17 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Update to version 3.6.2
+  * The init script is now installed to /etc/ rather than
+    /usr/local/etc by default.
+  * Minor bugfixes
+- Drop fuse-install-fix.patch, not needed with -Duseroot=false
+- Add conf-rename.patch, which is split from the above now
+  removed patch
+
 -------------------------------------------------------------------
 Thu Jun 20 09:48:24 UTC 2019 - Martin Liška <mliska@suse.cz>
 

fuse3.spec

@@ -17,7 +17,7 @@
 
 
 Name:           fuse3
-Version:        3.6.1
+Version:        3.6.2
 Release:        0
 Summary:        Reference implementation of the "Filesystem in Userspace"
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause
@@ -27,16 +27,16 @@ Source:         https://github.com/libfuse/libfuse/releases/download/fuse-%{vers
 Source1:        https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz.asc
 Source2:        fuse.keyring
 Source1000:     baselibs.conf
-Patch1:         fuse-install-fix.patch
+Patch1:         conf-rename.patch
 BuildRequires:  c++_compiler
 BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(udev)
 Requires:       util-linux >= 2.18
+Requires(pre):  group(trusted)
 Requires(pre):  permissions
 Supplements:    filesystem(fuse)
-Requires(pre):  group(trusted)
 
 %description
 With FUSE, a user space program can export a file system to the
@@ -87,7 +87,7 @@ https://github.com/libfuse/libfuse/wiki/
 
 %build
 %define _lto_cflags %{nil}
-%meson
+%meson -Duseroot=false
 %meson_build
 
 %install
@@ -104,7 +104,11 @@ ln -s -v /%{_libdir}/$libname %{buildroot}/%{_lib}
 done
 popd
 
-%fdupes -s doc 
+# Remove unneeded stuff
+rm -r %{buildroot}%{_prefix}/lib/udev
+rm -r %{buildroot}%{_initddir}
+
+%fdupes -s doc
 
 %post
 %set_permissions %{_bindir}/fusermount3