[fawkes] Add patch from Jaroslav Å karvada to get this building on rawhide and fix broken dep/FTBFS (#715874)

[alexlan]

commit b29aabdc99c006043e58deeac66282a5f6af3f03
Author: Alex Lancaster <alexlan[AT]fedoraproject org>
Date:   Fri Oct 14 19:00:35 2011 -0400

    Add patch from Jaroslav Škarvada to get this building on rawhide
    and fix broken dep/FTBFS (#715874)

 fawkes-0.4.2-build-fix.patch |   12 ++++++++++++
 fawkes.spec                  |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/fawkes-0.4.2-build-fix.patch b/fawkes-0.4.2-build-fix.patch
new file mode 100644
index 0000000..1fc4ddc
--- /dev/null
+++ b/fawkes-0.4.2-build-fix.patch
@@ -0,0 +1,12 @@
+--- fawkes-0.4.2/src/tools/skillgui/gvplugin_skillgui_cairo.h	2011-02-19 23:24:55.000000000 +0100
++++ fawkes-0.4.2/src/tools/skillgui/gvplugin_skillgui_cairo.h.orig	2011-08-19 15:33:35.899590613 +0200
+@@ -23,8 +23,8 @@ 
+ #ifndef __TOOLS_SKILLGUI_GVPLUGIN_SKILLGUI_CAIRO_H_
+ #define __TOOLS_SKILLGUI_GVPLUGIN_SKILLGUI_CAIRO_H_
+ 
+-#include <gvc.h>
+ #include <cairomm/cairomm.h>
++#include <gvc.h>
+ 
+ class SkillGuiCairoRenderInstructor
+ {
diff --git a/fawkes.spec b/fawkes.spec
index 634932f..15afcdd 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -1,6 +1,6 @@
 Name:           fawkes
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Robot Software Framework
 
 Group:          Applications/System
@@ -8,6 +8,7 @@ License:        GPLv2+ and GPLv2+ with exceptions
 URL:            http://www.fawkesrobotics.org
 Source0:        http://files.fawkesrobotics.org/releases/%{name}-%{version}.tar.bz2
 Patch0:         fawkes-0.4.2-ppc64.patch
+Patch1:		fawkes-0.4.2-build-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++, make >= 3.81
@@ -311,6 +312,7 @@ common Lua modules.
 %prep
 %setup -q
 %patch0 -p1 -b .ppc64
+%patch1 -p1 -b .build-fix
 
 
 %build
@@ -578,6 +580,10 @@ rm -rf %{buildroot}
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Fri Oct 14 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.2-6
+- Add patch from Jaroslav Škarvada to get this building on rawhide 
+  and fix broken dep/FTBFS (#715874)
+
 * Wed Aug 31 2011 Rex Dieter <rdieter at fedoraproject.org> 0.4.2-5
 - rebuild (opencv)