rpms/gnome-vfs2/devel vfs-inotify-types.patch, NONE, 1.1 gnome-vfs2.spec, 1.78, 1.79

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19861

Modified Files:
	gnome-vfs2.spec 
Added Files:
	vfs-inotify-types.patch 
Log Message:
fix inotify kernel type issue


vfs-inotify-types.patch:
 inotify-path.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE vfs-inotify-types.patch ---
Index: modules/inotify-path.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/inotify-path.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modules/inotify-path.c	10 Dec 2005 23:50:19 -0000	1.1
+++ modules/inotify-path.c	12 Dec 2005 16:03:49 -0000	1.2
@@ -24,6 +24,10 @@
 */
 
 #include "config.h"
+
+/* Don't put conflicting kernel types in the global namespace: */
+#define __KERNEL_STRICT_NAMES
+
 #include "local_inotify.h"
 #if 0
 #ifdef HAVE_SYS_INOTIFY_H


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gnome-vfs2.spec	13 Dec 2005 15:41:40 -0000	1.78
+++ gnome-vfs2.spec	13 Dec 2005 15:58:35 -0000	1.79
@@ -44,6 +44,9 @@
 
 Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
 
+# This is in upstream cvs:
+Patch400: vfs-inotify-types.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -88,6 +91,8 @@
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
+%patch400 -p0 -b .inotify_types
+
 %build
 
 if pkg-config openssl ; then