up to 3.2.2

- fuse.conf now installed by fuse itself (similar content but
  better documented)

diff --git a/fuse.conf b/fuse.conf
deleted file mode 100644 (file)
index bdcb935..0000000
--- a/fuse.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-# mount_max = 
-
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-# user_allow_other

diff --git a/libfuse3-build.patch b/libfuse3-build.patch
index 0cea4aea19d43242ffa79b46e454673cbbccd3e7..1df33e4a7d47adce922635ddf12ace3e57991aa9 100644 (file)
--- a/libfuse3-build.patch
+++ b/libfuse3-build.patch
@@ -1,6 +1,6 @@
 --- fuse-3.2.0/util/install_helper.sh.org      2017-10-31 08:57:43.252484720 +0100
 +++ fuse-3.2.0/util/install_helper.sh  2017-10-31 08:58:09.556525269 +0100
-@@ -11,25 +11,9 @@ bindir="$2"
+@@ -11,28 +11,12 @@ bindir="$2"
  udevrulesdir="$3"
  prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
  
@@ -18,6 +18,9 @@
  install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
          "${DESTDIR}/etc/init.d/fuse3"
  
+ install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
+       "${DESTDIR}/etc/fuse.conf"
+ 
 -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

diff --git a/libfuse3.spec b/libfuse3.spec
index 747de8ba3b930befad9dac5ac0324632e5efac95..5b1cc23e9281be2d23f00be4160ae44af67aa092 100644 (file)
--- a/libfuse3.spec
+++ b/libfuse3.spec
@@ -1,14 +1,13 @@
 Summary:       Filesystem in Userspace
 Summary(pl.UTF-8):     System plików w przestrzeni użytkownika
 Name:          libfuse3
-Version:       3.2.1
+Version:       3.2.2
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 #Source0Download: https://github.com/libfuse/libfuse/releases
 Source0:       https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz
-# Source0-md5: 5dc79e3b7e0afbd6f8c5c335405227d1
-Source1:       fuse.conf
+# Source0-md5: 4ca3306c042f1c841991e50a93b22a61
 Patch0:                %{name}-build.patch
 URL:           https://github.com/libfuse/libfuse
 BuildRequires: meson
@@ -78,8 +77,6 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/libfuse3.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libfuse3.so.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libfuse3.so
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-
 mv $RPM_BUILD_ROOT{%{_sbindir},/sbin}/mount.fuse3
 mv $RPM_BUILD_ROOT%{_mandir}/man8/mount.fuse{,3}.8.gz