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

[leigh123linux]

commit 3e3d864a5f6e3f614232597cd6104776206e862a
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Fri Sep 17 17:20:17 2010 +0100

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

 1286_1285.diff          |   11 ++---------
 awn-extras-applets.spec |    2 ++
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/1286_1285.diff b/1286_1285.diff
index 9da66f5..fb1c625 100644
--- a/1286_1285.diff
+++ b/1286_1285.diff
@@ -1,19 +1,12 @@
 === 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 @@
+@@ -156,7 +156,7 @@ cairo_menu_applet_constructed (GObject *
     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";
++  gchar * filename = APPLETSDIR"/../../../lib64/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 ef9d07f..61f52a9 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -116,7 +116,9 @@ 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
+%ifarch x86_64
 %patch25 -p0 -b .1286_1285
+%endif
 
 cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons