From e4e9ef31f30105fcabe3cdf81aad7f6f0baa41f9f8e9673ed5cd4e2492f73559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 3 Dec 2018 13:54:35 +0000
Subject: [PATCH] -

OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse3?expand=0&rev=12
---
 fuse-install-fix.patch | 23 +++++++++++++++++------
 fuse.conf              | 18 ------------------
 fuse3.spec             | 12 ++++--------
 3 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 fuse.conf

diff --git a/fuse-install-fix.patch b/fuse-install-fix.patch
index 2ab74ea..06f1453 100644
--- a/fuse-install-fix.patch
+++ b/fuse-install-fix.patch
@@ -1,7 +1,7 @@
-Index: fuse-3.2.6/util/install_helper.sh
+Index: fuse-3.3.0/util/install_helper.sh
 ===================================================================
---- fuse-3.2.6.orig/util/install_helper.sh
-+++ fuse-3.2.6/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
@@ -10,8 +10,8 @@ Index: fuse-3.2.6/util/install_helper.sh
 -chmod u+s "${DESTDIR}${bindir}/fusermount3"
 -
  install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
- 	"${DESTDIR}${sysconfdir}/fuse.conf"
- 
+-	"${DESTDIR}${sysconfdir}/fuse.conf"
+-
 -
 -if test ! -e "${DESTDIR}/dev/fuse"; then
 -    mkdir -p "${DESTDIR}/dev"
@@ -32,4 +32,15 @@ Index: fuse-3.2.6/util/install_helper.sh
 -    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,
diff --git a/fuse.conf b/fuse.conf
deleted file mode 100644
index 2d252c0..0000000
--- a/fuse.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# The file /etc/fuse.conf allows for the following parameters:
-#
-# user_allow_other - Using the allow_other mount option works fine as root, in
-# order to have it work as user you need user_allow_other in /etc/fuse.conf as 
-# well. (This option allows users to use the allow_other option.) You need 
-# allow_other if you want users other than the owner to access a mounted fuse. 
-# This option must appear on a line by itself. There is no value, just the 
-# presence of the option.
-
-#user_allow_other
-
-
-# mount_max = n - this option sets the maximum number of mounts.
-# Currently (2014) it must be typed exactly as shown
-# (with a single space before and after the equals sign).
-
-#mount_max = 1000
-
diff --git a/fuse3.spec b/fuse3.spec
index 4be411c..54f29a6 100644
--- a/fuse3.spec
+++ b/fuse3.spec
@@ -24,10 +24,9 @@ License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/Filesystems
 URL:            https://github.com/libfuse/libfuse
 Source:         https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz
-Source1:        baselibs.conf
-Source2:        fuse.conf
-Source3:        https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz.asc
-Source4:        fuse.keyring
+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
 BuildRequires:  fdupes
 BuildRequires:  meson
@@ -93,9 +92,6 @@ https://github.com/libfuse/libfuse/wiki/
 %install
 %meson_install
 
-rm -rf %{buildroot}/%{_sysconfdir}/init.d
-install -m644 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/fuse.conf
-
 find %{buildroot} -type f -name "*.la" -delete -print
 
 #UsrMerge
@@ -128,7 +124,7 @@ popd
 /sbin/mount.fuse3
 #EndUsrMerge
 %{_sbindir}/mount.fuse3
-%config %{_sysconfdir}/fuse.conf
+%config %{_sysconfdir}/fuse3.conf
 %{_mandir}/man1/fusermount3.1%{?ext_man}
 %{_mandir}/man8/mount.fuse3.8%{?ext_man}