From c4b94da2affa27d1e5af8526d4ec6cdbd7827e93 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Jul 06 2013 04:19:07 +0000
Subject: update to 2.9.3


---

diff --git a/fuse-2.9.2-namespace-conflict-fix.patch b/fuse-2.9.2-namespace-conflict-fix.patch
new file mode 100644
index 0000000..ae67e7d
--- /dev/null
+++ b/fuse-2.9.2-namespace-conflict-fix.patch
@@ -0,0 +1,21 @@
+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:
diff --git a/fuse.spec b/fuse.spec
index 3df004e..149e853 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,5 +1,5 @@
 Name:           fuse
-Version:        2.9.2
+Version:        2.9.3
 Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
@@ -10,15 +10,12 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:	%{name}.conf
 
 Patch1:		fuse-0001-More-parentheses.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       kernel >= 2.6.14
+# https://bugzilla.redhat.com/show_bug.cgi?id=970768
+Patch2:		fuse-2.9.2-namespace-conflict-fix.patch
 Requires:       which
 Conflicts:      filesystem < 3
 BuildRequires:  libselinux-devel
 
-Requires(preun): chkconfig
-Requires(preun): initscripts
-
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
 userspace program. This package contains the FUSE userspace tools to
@@ -54,6 +51,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 .conflictfix
 
 %build
 # Can't pass --disable-static here, or else the utils don't build
@@ -62,40 +60,27 @@ CFLAGS="%{optflags} -D_GNU_SOURCE" %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 # change from 4755 to 0755 to allow stripping -- fixed later in files
-chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+chmod 0755 %{buildroot}/%{_bindir}/fusermount
 
 # Get rid of static libs
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f %{buildroot}/%{_libdir}/*.a
 # No need to create init-script
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
+rm -f %{buildroot}%{_sysconfdir}/init.d/fuse
 
 # Install config-file
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}
 
 # Delete pointless udev rules, which do not belong in /etc (brc#748204)
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-fuse.rules
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%preun
-if [ -f /etc/init.d/fuse ] ; then
-    /sbin/service fuse stop >/dev/null 2>&1
-    /sbin/chkconfig --del fuse
-fi
-
+rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/99-fuse.rules
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS
 %{_sbindir}/mount.fuse
 %attr(4755,root,root) %{_bindir}/fusermount
@@ -105,13 +90,11 @@ fi
 %{_mandir}/man8/*
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
 %{_libdir}/libulockmgr.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libfuse.so
 %{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
@@ -120,6 +103,22 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Sat Jul  6 2013 Tom Callaway <spot@fedoraproject.org> - 2.9.3-1
+- update to 2.9.3
+
+* Wed Jun 26 2013 Tom Callaway <spot@fedoraproject.org> - 2.9.2-4
+- add fix for namespace conflict in fuse_kernel.h
+
+* Sat May 18 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.9.2-3
+- Removed pre-F12 stuff
+- Dropped ancient dependency on initscripts and chkconfig
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Dec 06 2012 Adam Jackson <ajax@redhat.com>
+- Remove ancient Requires: kernel >= 2.6.14, FC6 was 2.6.18.
+
 * Tue Oct 23 2012 Tom Callaway <spot@fedoraproject.org> - 2.9.2-1
 - update to 2.9.2
 
diff --git a/sources b/sources
index c8e3c63..e4b0a78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d80d0dc9cc2b9199a0c53787c151205  fuse-2.9.2.tar.gz
+33cae22ca50311446400daf8a6255c6a  fuse-2.9.3.tar.gz