From fdd22b10e8323ac212bf2713d0cd3978e5dec1e0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:58:22 +0000 Subject: import fuse-2.9.2-6.el7 --- diff --git a/SOURCES/fuse-aarch64.patch b/SOURCES/fuse-aarch64.patch new file mode 100644 index 0000000..180f544 --- /dev/null +++ b/SOURCES/fuse-aarch64.patch @@ -0,0 +1,20 @@ +Upstream-Status: Submitted + +Signed-off-by: Riku Voipio + +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h +@@ -88,12 +88,7 @@ + #ifndef _LINUX_FUSE_H + #define _LINUX_FUSE_H + +-#include +-#define __u64 uint64_t +-#define __s64 int64_t +-#define __u32 uint32_t +-#define __s32 int32_t +-#define __u16 uint16_t ++#include + + /* + * Version negotiation: diff --git a/SPECS/fuse.spec b/SPECS/fuse.spec index 88e2452..91fcedc 100644 --- a/SPECS/fuse.spec +++ b/SPECS/fuse.spec @@ -1,6 +1,6 @@ Name: fuse Version: 2.9.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Source1: %{name}.conf Patch1: fuse-0001-More-parentheses.patch +Patch2: fuse-aarch64.patch Requires: which Conflicts: filesystem < 3 BuildRequires: libselinux-devel @@ -51,6 +52,7 @@ pgk-config) to develop FUSE based applications/filesystems. #disable device creation during build/install sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in %patch1 -p1 -b .add_parentheses +%patch2 -p1 -b .aarch64 %build # Can't pass --disable-static here, or else the utils don't build @@ -102,6 +104,9 @@ rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/99-fuse.rules %{_includedir}/fuse %changelog +* Tue Jun 17 2014 Brian Foster - 2.9.2-6 +- Use kernel types not sys types. + * Fri Jan 24 2014 Daniel Mach - 2.9.2-5 - Mass rebuild 2014-01-24