fuse: Update to 3.13.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/fuse/fuse.nm b/fuse/fuse.nm
index 37dbd2031518f5de791348ce21dd934db2517e9e..2482e1c7fff1c4450a9413a0023a0b288c071a42 100644 (file)
--- a/fuse/fuse.nm
+++ b/fuse/fuse.nm
@@ -4,13 +4,14 @@
 ###############################################################################
 
 name       = fuse
-version    = 2.9.7
-release    = 2
+version    = 3.13.1
+release    = 1
 
 groups     = System/Filesystems
-url        = http://fuse.sf.net/
+url        = https://github.com/libfuse/libfuse
 license    = GPL+
-summary    = File System in Userspace (FUSE) utilities.
+summary    = File System in Userspace (FUSE) utilities
+
 
 description
        With FUSE it is possible to implement a fully functional
@@ -19,18 +20,24 @@ description
 end
 
 source_dl  = https://github.com/libfuse/libfuse/releases/download/%{thisapp}/
+sources    = %{thisapp}.tar.xz
 
 build
-       configure_options += \
-               --disable-static \
-               --disable-rpath
+       requires
+               meson
+               ninja
+               systemd-devel
+       end
 
-       install_cmds
-               # Remove old sysvinit directory.
-               rm -vrf %{BUILDROOT}/etc/init.d
+       build
+               %{meson} \
+                       -Dinitscriptdir= \
+                       -Duseroot=false
+               %{meson_build}
+       end
 
-               # Remove /dev/fuse which cannot be packaged.
-               rm -rvf %{BUILDROOT}/dev
+       install
+               %{meson_install}
        end
 end
 

diff --git a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
deleted file mode 100644 (file)
index ae67e7d..0000000
--- a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
---- fuse-2.9.2/include/fuse_kernel.h.conflictfix       2013-06-26 09:31:57.862198038 -0400
-+++ fuse-2.9.2/include/fuse_kernel.h   2013-06-26 09:32:19.679198365 -0400
-@@ -88,12 +88,16 @@
- #ifndef _LINUX_FUSE_H
- #define _LINUX_FUSE_H
- 
--#include <sys/types.h>
-+#ifdef __linux__
-+#include <linux/types.h>
-+#else
-+#include <stdint.h>
- #define __u64 uint64_t
- #define __s64 int64_t
- #define __u32 uint32_t
- #define __s32 int32_t
- #define __u16 uint16_t
-+#endif
- 
- /*
-  * Version negotiation: