[awn-extras-applets] - apply upstream fix for cairo-menu (Bz 601616)

[leigh123linux]

commit c0233cd04c4e78f0d67cf9ee02d39f5ca9de36ec
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Fri Sep 17 16:55:25 2010 +0100

    - apply upstream fix for cairo-menu (Bz 601616)

 1286_1285.diff          |   19 +++++++++++++++++++
 awn-extras-applets.spec |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/1286_1285.diff b/1286_1285.diff
new file mode 100644
index 0000000..9da66f5
--- /dev/null
+++ b/1286_1285.diff
@@ -0,0 +1,19 @@
+=== modified file 'applets/maintained/cairo-menu/cairo-menu-applet.c'
+--- applets/maintained/cairo-menu/cairo-menu-applet.c	2010-03-28 15:07:05 +0000
++++ applets/maintained/cairo-menu/cairo-menu-applet.c	2010-04-14 14:29:04 +0000
+@@ -156,12 +156,11 @@
+    TODO fix the various travesties*/
+   GList * iter;
+   GError * error = NULL;
+-  gchar * filename = APPLETSDIR"/../../../lib/awn/applets/cairo-menu/gnome-menu-builder";
++  gchar * filename = LIBDIR"/awn/applets/cairo-menu/gnome-menu-builder";
+   GModule      *module;
+ 
+   G_OBJECT_CLASS (cairo_menu_applet_parent_class)->constructed (object);
+-  module = g_module_open (filename, 
+-                          G_MODULE_BIND_LAZY);  
++  module = g_module_open (filename,G_MODULE_BIND_LAZY);  
+   g_assert (module);
+   if (!g_module_symbol (module, "menu_build", (gpointer *)&menu_build))
+   {
+
diff --git a/awn-extras-applets.spec b/awn-extras-applets.spec
index abf0dc7..3e187ea 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -8,7 +8,7 @@
 
 Name:           awn-extras-applets
 Version:        0.4.0
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -32,6 +32,7 @@ Patch21:        1388_1387.diff
 Patch22:        1389_1388.diff
 Patch23:        1390_1389.diff
 Patch24:        1391_1390.diff
+Patch25:        1286_1285.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -115,6 +116,7 @@ awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 %patch22 -p0 -b .1389_1388
 %patch23 -p0 -b .1390_1389
 %patch24 -p0 -b .1391_1390
+%patch25 -p0 -b .1286_1285
 
 cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
 
@@ -224,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 17 2010 leigh scott <leigh123linux at googlemail.com> - 0.4.0-24
+- apply upstream fix for cairo-menu (Bz 601616)
+
 * Tue Sep 14 2010 leigh scott <leigh123linux at googlemail.com> - 0.4.0-23
 - apply upstream fix for mail  applet (Bz 591211)