[libgtkhotkey] fix FTBFS

[Peter Robinson]

commit 67e99f0328a1d9356e52c8a4e434f48a617cc105
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jul 8 20:49:12 2012 +0100

    fix FTBFS

 gtkhotkey-include.patch |   22 ++++++++++++++++++++++
 libgtkhotkey.spec       |   13 ++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/gtkhotkey-include.patch b/gtkhotkey-include.patch
new file mode 100644
index 0000000..f715e98
--- /dev/null
+++ b/gtkhotkey-include.patch
@@ -0,0 +1,22 @@
+--- gtkhotkey-0.2.1/src/gtk-hotkey-error.h.orig	2012-07-08 19:59:51.986666942 +0100
++++ gtkhotkey-0.2.1/src/gtk-hotkey-error.h	2012-07-08 20:00:17.534665522 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+ 
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- gtkhotkey-0.2.1/src/x11/tomboykeybinder.h.orig	2012-07-08 20:03:51.987654074 +0100
++++ gtkhotkey-0.2.1/src/x11/tomboykeybinder.h	2012-07-08 20:03:59.497653497 +0100
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/libgtkhotkey.spec b/libgtkhotkey.spec
index acb36f0..e26e901 100644
--- a/libgtkhotkey.spec
+++ b/libgtkhotkey.spec
@@ -1,17 +1,17 @@
 Name:           libgtkhotkey
 Version:        0.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Platform independent hotkey handling for Gtk+ applications
 
 Group:          System Environment/Libraries
 License:        LGPLv3 
 URL:            https://launchpad.net/gtkhotkey
 Source0:        http://launchpad.net/gtkhotkey/0.2/%{version}/+download/gtkhotkey-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Use datadir instead of prefix to install documentation
 # patch mailed to author on 2009-09-22
 Patch0:         libgtkhotkey_doc_prefix.patch
+Patch1:         gtkhotkey-include.patch
 
 BuildRequires:  gtk2-devel, intltool, pkgconfig
 
@@ -31,6 +31,7 @@ developing applications that use %{name}.
 %prep
 %setup -q -n gtkhotkey-%{version}
 %patch0 -p1
+%patch1 -p1 -b .glib-include
 
 %build
 %configure --disable-static
@@ -38,7 +39,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -46,10 +46,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gtkhotkey
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -69,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul  8 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.2.1-7
+- Fix FTBFS
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild