[photoprint] add glib-includes patch to not include glib/*

[Matt Domsch]

commit c6665aa45e96b041deafdd6464b06b2d44703332
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Mon Nov 14 09:45:05 2011 -0600

    add glib-includes patch to not include glib/*

 photoprint-0.4.2-pre2-glib-includes.patch |   23 +++++++++++++++++++++++
 photoprint.spec                           |    3 +++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/photoprint-0.4.2-pre2-glib-includes.patch b/photoprint-0.4.2-pre2-glib-includes.patch
new file mode 100644
index 0000000..50d3120
--- /dev/null
+++ b/photoprint-0.4.2-pre2-glib-includes.patch
@@ -0,0 +1,23 @@
+diff -urNp '--exclude-from=/home/mdomsch/excludes' --minimal photoprint-0.4.2-pre2.orig/gp_cppsupport/gprinter.cpp photoprint-0.4.2-pre2/gp_cppsupport/gprinter.cpp
+--- photoprint-0.4.2-pre2.orig/gp_cppsupport/gprinter.cpp	2011-11-14 09:23:02.224544252 -0600
++++ photoprint-0.4.2-pre2/gp_cppsupport/gprinter.cpp	2011-11-14 09:25:33.756194583 -0600
+@@ -22,8 +22,6 @@
+ #include <gutenprint/gutenprint.h>
+ 
+ #include <glib.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gprintf.h>
+ 
+ #include "../imagesource/imagesource.h"
+ #include "../imagesource/imagesource_flatten.h"
+diff -urNp '--exclude-from=/home/mdomsch/excludes' --minimal photoprint-0.4.2-pre2.orig/gp_cppsupport/gprintersettings.cpp photoprint-0.4.2-pre2/gp_cppsupport/gprintersettings.cpp
+--- photoprint-0.4.2-pre2.orig/gp_cppsupport/gprintersettings.cpp	2011-11-14 09:23:02.224544252 -0600
++++ photoprint-0.4.2-pre2/gp_cppsupport/gprintersettings.cpp	2011-11-14 09:25:45.709087906 -0600
+@@ -13,7 +13,6 @@
+ 
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
+ 
+ #include "stp_support/stputil.h"
+ #include "gprintersettings.h"
diff --git a/photoprint.spec b/photoprint.spec
index 4d80bd0..a4c533a 100644
--- a/photoprint.spec
+++ b/photoprint.spec
@@ -11,6 +11,7 @@ URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01P
 Source0:        http://www.blackfiveimaging.co.uk/photoprint/photoprint-0.4.2-pre2.tar.gz
 Patch0:         photoprint-0.4.2-pre2-lib.patch
 Patch1:         photoprint-0.4.2-pre2-gettext-autoreconf-libtoolize.patch
+Patch2:         photoprint-0.4.2-pre2-glib-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gutenprint-devel
@@ -49,6 +50,7 @@ PhotoPrint can do the following:
 %setup -q -n %{name}-%{version}-pre2
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -96,6 +98,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Mon Nov 14 2011 Matt Domsch <mdomsch at fedoraproject.org> - 0.4.2-0.3.pre2
 - bump to pick up new libnetpbm
+- patch to not include glib/*, only glib.h, required by new glib
 
 * Thu Jun 23 2011 Matt Domsch <mdomsch at fedoraproject.org> - 0.4.2-0.2.pre2
 - obsolete photoprint-borders, content is merged into photoprint by upstream