rpms/gamin/devel gamin-0.1.7-fallback.patch, NONE, 1.1 gamin.spec, 1.57, 1.58

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11248

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.7-fallback.patch 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-5
- Add patch that handles inotify failing fallback (#233316)



gamin-0.1.7-fallback.patch:
 inotify-helper.c |    3 +--
 inotify-kernel.c |    2 +-
 inotify-path.c   |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gamin-0.1.7-fallback.patch ---
diff -Naur gamin-0.1.7/server/inotify-helper.c gamin-0.1.7.new/server/inotify-helper.c
--- gamin-0.1.7/server/inotify-helper.c	2007-02-08 15:29:03.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-helper.c	2007-02-08 15:33:50.000000000 +0000
@@ -87,14 +87,13 @@
 		return result;
 	}
 
-	initialized = TRUE;
-
 	result = ip_startup (ih_event_callback);
 	if (!result) {
 		g_warning( "Could not initialize inotify\n");
 		G_UNLOCK(inotify_lock);
 		return FALSE;
 	}
+	initialized = TRUE;
 	user_ecb = ecb;
 	user_fcb = fcb;
 	im_startup (ih_found_callback);
diff -Naur gamin-0.1.7/server/inotify-kernel.c gamin-0.1.7.new/server/inotify-kernel.c
--- gamin-0.1.7/server/inotify-kernel.c	2007-02-08 15:29:02.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-kernel.c	2007-02-08 15:33:32.000000000 +0000
@@ -200,12 +200,12 @@
 		return inotify_instance_fd >= 0;
 	}
 
-	initialized = TRUE;
 	inotify_instance_fd = inotify_init ();
 
 	if (inotify_instance_fd < 0) {
 		return FALSE;
 	}
+	initialized = TRUE;
 
 	inotify_read_ioc = g_io_channel_unix_new(inotify_instance_fd);
 	ik_poll_fd.fd = inotify_instance_fd;
diff -Naur gamin-0.1.7/server/inotify-path.c gamin-0.1.7.new/server/inotify-path.c
--- gamin-0.1.7/server/inotify-path.c	2007-02-08 15:29:03.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-path.c	2007-02-08 15:32:31.000000000 +0000
@@ -96,13 +96,13 @@
 		return result;
 	}
 
-	initialized = TRUE;
 	event_callback = cb;
 	result = ik_startup (ip_event_callback);
 
 	if (!result) {
 		return FALSE;
 	}
+	initialized = TRUE;
 
 	path_dir_hash = g_hash_table_new(g_str_hash, g_str_equal);
 	sub_dir_hash = g_hash_table_new(g_direct_hash, g_direct_equal);


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gamin.spec	7 Mar 2007 11:11:47 -0000	1.57
+++ gamin.spec	11 Apr 2007 14:38:04 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -26,6 +26,7 @@
 
 Patch1:         gamin-0.1.7-fix-polling.patch
 Patch2:         gamin-conditional-poll.patch
+Patch3:         gamin-0.1.7-fallback.patch
 
 %description devel
 This C library provides an API and ABI compatible file alteration
@@ -47,6 +48,7 @@
 
 %patch1 -p1 -b .fix-polling
 %patch2 -p0 -b .conditional-poll
+%patch3 -p1 -b .fallback
 
 %build
 autoreconf --force --install
@@ -95,6 +97,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-5
+- Add patch that handles inotify failing fallback (#233316)
+
 * Wed Mar  7 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-4
 - Add patch to fix #204906