Accepting request 855571 from filesystems

OBS-URL: https://build.opensuse.org/request/show/855571
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=73

aarch64-build-fix.patch

@@ -1,6 +1,12 @@
---- include/fuse_kernel.h
+---
-+++ include/fuse_kernel.h
+ include/fuse_kernel.h |    7 +------
-@@ -85,12 +85,7 @@
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+Index: fuse-2.9.9/include/fuse_kernel.h
+===================================================================
+--- fuse-2.9.9.orig/include/fuse_kernel.h
++++ fuse-2.9.9/include/fuse_kernel.h
+@@ -88,12 +88,7 @@
  #ifndef _LINUX_FUSE_H
  #define _LINUX_FUSE_H
  

fuse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 20 10:10:06 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Modernize some older specfile constructs. Rediff patch4 as -p1.
+- Update descriptions.
+
 -------------------------------------------------------------------
 Tue Nov 10 10:52:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 

fuse.spec

@@ -19,7 +19,7 @@
 Name:           fuse
 Version:        2.9.9
 Release:        0
-Summary:        User space File System
+Summary:        Reference implementation of the "Filesystem in Userspace"
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/Filesystems
 URL:            https://github.com/libfuse/libfuse
@@ -36,53 +36,19 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
-# FIXME: use proper Requires(pre/post/preun/...)
+Requires(post): permissions
-PreReq:         permissions
-%if 0%{?suse_version} > 1320
 Requires(pre):  group(trusted)
-%endif
-%if 0%{?suse_version} > 1130
 Requires:       util-linux >= 2.18
-%else
-Requires:       util-linux(fake+no-canonicalize)
-%endif
-%if 0%{?suse_version} >= 1000
 Supplements:    filesystem(fuse)
-%endif
 
 %description
-With FUSE, a user space program can export a file system through the
+FUSE (Filesystem in Userspace) is an interface by the Linux kernel
-kernel-default (Linux kernel).
+for userspace programs to export a filesystem to the kernel.
 
-User space file systems which are implemented using FUSE are provided
+This package contains helper programs for using FUSE mounts.
-by the following packages:
 
-- curlftpfs (mount FTP servers),
+FUSE file systems are typically implemented as a standalone
-
+applications in their own right and are packaged separately.
-- encfs (layered file encryption),
-
-- fuseiso (mount iso, img, bin, mdf and nrg CD-ROM images),
-
-- fusepod (mount iPods),
-
-- fusesmb (mount a fully browseable network neighborhood),
-
-- gphotofs (mount gphoto-supported cameras),
-
-- ntfs-3g (mount NTFS volumes read-write),
-
-- obexfs (mount of bluetooth devices),
-
-- sshfs (mount over ssh),
-
-- wdfs (mount of WebDAV shares)
-
-This package contains the mount binaries for fuse (might not be needed
-by some FUSE filesystems like ntfs-3g) and the documentation for FUSE.
-
-After installing fuse-devel, administrators can compile and install
-other user space file systems which can be found at
-https://github.com/libfuse/libfuse/wiki/
 
 %package -n libulockmgr1
 Summary:        Library of FUSE, the User space File System for GNU/Linux and BSD
@@ -97,16 +63,12 @@ Summary:        Library of FUSE, the User space File System for GNU/Linux and BS
 Group:          System/Filesystems
 
 %description -n libfuse2
-With FUSE, a user space program can export a file system through the
+FUSE (Filesystem in Userspace) is an interface by the Linux kernel
-kernel-default (Linux kernel).
+for userspace programs to export a filesystem to the kernel.
 
-A FUSE file system which only needs libfuse2 is ntfs-3g, other FUSE
+A FUSE file system is typically implemented as a standalone
-file systems might need the fuse package in addition to have fusermount
+application that links with libfuse. libfuse provides a C API over
-and /sbin/mount.fuse.
+the raw kernel interface.
-
-After installing fuse-devel, administrators can compile and install
-other user space file systems which can be found at
-https://github.com/libfuse/libfuse/wiki/
 
 %package doc
 Summary:        Document package for FUSE (userspace filesystem)
@@ -127,11 +89,10 @@ Requires:       libulockmgr1 = %{version}
 %description devel
 This package contains all include files, libraries and configuration
 files needed to develop programs that use the fuse (FUSE) library to
-implement kernel-default (Linux) file systems in user space.
+implement file systems in user space.
 
-With fuse-devel, administrators can compile and install other user
+With fuse-devel, users can compile and install other user space file
-space file systems which can be found at
+systems.
-https://github.com/libfuse/libfuse/wiki/
 
 %package devel-static
 Summary:        Development package for FUSE (userspace filesystem) modules
@@ -140,26 +101,17 @@ Requires:       fuse-devel = %{version}
 Provides:       fuse-devel:%{_libdir}/libfuse.a
 
 %description devel-static
-This package contains all include files, libraries and configuration
+This package contains the static library variants of libfuse.
-files needed to develop programs that use the fuse (FUSE) library to
-implement kernel-default (Linux) file systems in user space.
-
-With fuse-devel, administrators can compile and install other user
-space file systems which can be found at
-https://github.com/libfuse/libfuse/wiki/
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
-%patch3 -p1
-%patch4
 
 %build
 %define _lto_cflags %{nil}
 export CFLAGS="%{optflags} -g -fno-strict-aliasing"
 export MOUNT_FUSE_PATH=%{_sbindir}
 autoreconf -fi
-%configure --with-pic \
+%configure \
     --with-pkgconfigdir=%{_libdir}/pkgconfig \
     --enable-lib \
     --enable-util \