Hello community, here is the log from the commit of package gamin for openSUSE:Factory checked in at 2013-09-26 19:33:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gamin (Old) and /work/SRC/openSUSE:Factory/.gamin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gamin" Changes: -------- --- /work/SRC/openSUSE:Factory/gamin/gamin.changes 2013-04-26 15:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gamin.new/gamin.changes 2013-09-26 19:33:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 24 21:33:01 UTC 2013 - hrvoje.sen...@gmail.com + +- Added 0001-Poll-files-on-nfs4.patch (bgo#693006) and + gamin-0.1.11-double-lock.patch (bgo#669292) + +------------------------------------------------------------------- New: ---- 0001-Poll-files-on-nfs4.patch gamin-0.1.11-double-lock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gamin.spec ++++++ --- /var/tmp/diff_new_pack.HnlAcI/_old 2013-09-26 19:33:01.000000000 +0200 +++ /var/tmp/diff_new_pack.HnlAcI/_new 2013-09-26 19:33:01.000000000 +0200 @@ -33,6 +33,10 @@ Patch1: gamin-fam_abi_compatibility_FamErrlist.patch Patch2: gamin-fix_python_main.patch Patch3: gamin-obsol-glib.diff +# PATCH-FIX-UPSTREAM gamin-0.1.11-double-lock.patch (bgo#669292) +Patch4: gamin-0.1.11-double-lock.patch +# PATCH-FIX-UPSTREAM 0001-Poll-files-on-nfs4.patch (bgo#693006) +Patch5: 0001-Poll-files-on-nfs4.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libstdc++-devel @@ -116,6 +120,8 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure --disable-static ++++++ 0001-Poll-files-on-nfs4.patch ++++++ >From b92b17ecced6df463da73d6de566740cf5cd00d4 Mon Sep 17 00:00:00 2001 From: Marek Kasik <mka...@redhat.com> Date: Fri, 1 Feb 2013 15:19:58 +0100 Subject: [PATCH 1/2] Poll files on nfs4 Add nfs4 among polled filesystems. https://bugzilla.gnome.org/show_bug.cgi?id=693006 --- server/gam_fs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/gam_fs.c b/server/gam_fs.c index c8ca704..143a603 100644 --- a/server/gam_fs.c +++ b/server/gam_fs.c @@ -178,6 +178,7 @@ gam_fs_init (void) gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0); gam_fs_set ("novfs", GFS_MT_POLL, 30); gam_fs_set ("nfs", GFS_MT_POLL, 5); + gam_fs_set ("nfs4", GFS_MT_POLL, 5); if (stat("/etc/mtab", &mtab_sbuf) != 0) { GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n"); -- 1.8.1.2 ++++++ gamin-0.1.11-double-lock.patch ++++++ >From 50df2c4de7b3aa8bed8781c92afb9a635a01df3f Mon Sep 17 00:00:00 2001 From: Sandro Mani <manisan...@gmail.com> Date: Fri, 3 Feb 2012 09:10:21 +0100 Subject: [PATCH] Fix double lock https://bugzilla.gnome.org/show_bug.cgi?id=669292 --- server/inotify-helper.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/server/inotify-helper.c b/server/inotify-helper.c index d77203e..defa7c6 100644 --- a/server/inotify-helper.c +++ b/server/inotify-helper.c @@ -127,9 +127,6 @@ ih_sub_add (ih_sub_t * sub) gboolean ih_sub_cancel (ih_sub_t * sub) { - G_LOCK(inotify_lock); - - if (!sub->cancelled) { IH_W("cancelling %s\n", sub->pathname); @@ -140,7 +137,6 @@ ih_sub_cancel (ih_sub_t * sub) sub_list = g_list_remove (sub_list, sub); } - G_UNLOCK(inotify_lock); return TRUE; } -- 1.7.9 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
