[libsexy] Update for recent GTK+ 2.x

[Daniel Williams]

commit ee21f3a932f5aa234153daa22244bf99a9220048
Author: Dan Williams <dcbw at redhat.com>
Date:   Fri Mar 25 18:55:23 2011 -0500

    Update for recent GTK+ 2.x

 gtk2-single-include.patch |   61 +++++++++++++++++++++++++++++++++++++++++++++
 libsexy.spec              |    7 ++++-
 2 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/gtk2-single-include.patch b/gtk2-single-include.patch
new file mode 100644
index 0000000..dd729ea
--- /dev/null
+++ b/gtk2-single-include.patch
@@ -0,0 +1,61 @@
+diff -up libsexy-0.1.11/libsexy/sexy-icon-entry.h.foo libsexy-0.1.11/libsexy/sexy-icon-entry.h
+--- libsexy-0.1.11/libsexy/sexy-icon-entry.h.foo	2011-03-25 18:38:36.958790038 -0500
++++ libsexy-0.1.11/libsexy/sexy-icon-entry.h	2011-03-25 18:38:42.624719205 -0500
+@@ -25,8 +25,7 @@ typedef struct _SexyIconEntry      SexyI
+ typedef struct _SexyIconEntryClass SexyIconEntryClass;
+ typedef struct _SexyIconEntryPriv  SexyIconEntryPriv;
+ 
+-#include <gtk/gtkentry.h>
+-#include <gtk/gtkimage.h>
++#include <gtk/gtk.h>
+ 
+ #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
+ #define SEXY_ICON_ENTRY(obj) \
+diff -up libsexy-0.1.11/libsexy/sexy-spell-entry.h.foo libsexy-0.1.11/libsexy/sexy-spell-entry.h
+--- libsexy-0.1.11/libsexy/sexy-spell-entry.h.foo	2011-03-25 18:37:44.664443809 -0500
++++ libsexy-0.1.11/libsexy/sexy-spell-entry.h	2011-03-25 18:37:51.558357623 -0500
+@@ -25,7 +25,7 @@ typedef struct _SexySpellEntry      Sexy
+ typedef struct _SexySpellEntryClass SexySpellEntryClass;
+ typedef struct _SexySpellEntryPriv  SexySpellEntryPriv;
+ 
+-#include <gtk/gtkentry.h>
++#include <gtk/gtk.h>
+ 
+ #define SEXY_TYPE_SPELL_ENTRY            (sexy_spell_entry_get_type())
+ #define SEXY_SPELL_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_SPELL_ENTRY, SexySpellEntry))
+diff -up libsexy-0.1.11/libsexy/sexy-tooltip.h.foo libsexy-0.1.11/libsexy/sexy-tooltip.h
+--- libsexy-0.1.11/libsexy/sexy-tooltip.h.foo	2011-03-25 18:38:08.409146960 -0500
++++ libsexy-0.1.11/libsexy/sexy-tooltip.h	2011-03-25 18:38:13.621081802 -0500
+@@ -24,7 +24,7 @@
+ typedef struct _SexyTooltip      SexyTooltip;
+ typedef struct _SexyTooltipClass SexyTooltipClass;
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ #define SEXY_TYPE_TOOLTIP            (sexy_tooltip_get_type())
+ #define SEXY_TOOLTIP(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_TOOLTIP, SexyTooltip))
+diff -up libsexy-0.1.11/libsexy/sexy-tree-view.h.foo libsexy-0.1.11/libsexy/sexy-tree-view.h
+--- libsexy-0.1.11/libsexy/sexy-tree-view.h.foo	2011-03-25 18:38:24.882941008 -0500
++++ libsexy-0.1.11/libsexy/sexy-tree-view.h	2011-03-25 18:38:29.779879786 -0500
+@@ -26,7 +26,7 @@ typedef struct _SexyTreeView      SexyTr
+ typedef struct _SexyTreeViewClass SexyTreeViewClass;
+ typedef struct _SexyTreeViewPriv  SexyTreeViewPriv;
+ 
+-#include <gtk/gtktreeview.h>
++#include <gtk/gtk.h>
+ 
+ #define SEXY_TYPE_TREE_VIEW            (sexy_tree_view_get_type())
+ #define SEXY_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_TREE_VIEW, SexyTreeView))
+diff -up libsexy-0.1.11/libsexy/sexy-url-label.h.foo libsexy-0.1.11/libsexy/sexy-url-label.h
+--- libsexy-0.1.11/libsexy/sexy-url-label.h.foo	2011-03-25 18:38:53.984577188 -0500
++++ libsexy-0.1.11/libsexy/sexy-url-label.h	2011-03-25 18:38:57.991527095 -0500
+@@ -24,7 +24,7 @@
+ typedef struct _SexyUrlLabel      SexyUrlLabel;
+ typedef struct _SexyUrlLabelClass SexyUrlLabelClass;
+ 
+-#include <gtk/gtklabel.h>
++#include <gtk/gtk.h>
+ 
+ #define SEXY_TYPE_URL_LABEL (sexy_url_label_get_type())
+ #define SEXY_URL_LABEL(obj) \
diff --git a/libsexy.spec b/libsexy.spec
index ddfd76b..b97e240 100644
--- a/libsexy.spec
+++ b/libsexy.spec
@@ -1,6 +1,6 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@ URL:            http://www.chipx86.com/w/index.php/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-url-label.patch
 Patch1:		%{name}-icon-name.patch
+Patch2:         gtk2-single-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -39,6 +40,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .url-label
 %patch1 -p1 -b .icon-name
+%patch2 -p1 -b .gtk-single-include
 
 
 %build
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 25 2011 Dan Williams <dcbw at redhat.com> - 0.1.11-17
+- Update for recent GTK+ 2.x
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.11-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild