[koffice] fix FTBFS against newer glib2

[Rex Dieter]

commit d8055684ba40e449c0ad390f91de725e79af95e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 08:36:44 2011 -0500

    fix FTBFS against newer glib2

 koffice-2.3.3-glib.patch |   12 ++++++++++++
 koffice.spec             |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/koffice-2.3.3-glib.patch b/koffice-2.3.3-glib.patch
new file mode 100644
index 0000000..9c7fefb
--- /dev/null
+++ b/koffice-2.3.3-glib.patch
@@ -0,0 +1,12 @@
+diff -up koffice-2.3.3/filters/kword/msword-odf/wv2/src/olestream.h.glib koffice-2.3.3/filters/kword/msword-odf/wv2/src/olestream.h
+--- koffice-2.3.3/filters/kword/msword-odf/wv2/src/olestream.h.glib	2011-02-17 06:12:35.000000000 -0600
++++ koffice-2.3.3/filters/kword/msword-odf/wv2/src/olestream.h	2011-11-04 08:33:12.410475134 -0500
+@@ -23,7 +23,7 @@
+ #include "global.h"  // U8,... typedefs
+ #include <stack>
+ 
+-#include <glib/giochannel.h> // GSeekType
++#include <glib.h> // GSeekType
+ #include "wv2_export.h"
+ 
+ namespace wvWare {
diff --git a/koffice.spec b/koffice.spec
index 5e7e5c1..34cd681 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -16,7 +16,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.3.3
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -31,6 +31,8 @@ Patch50: koffice-2.3.2-gcc46.patch
 # qt 4.8 FTBFS
 # https://bugzilla.redhat.com/show_bug.cgi?id=736659 - see upstream references (qt, kde)
 Patch51: koffice-2.3.3-no-qdebug-pixmap.patch
+# FTBFS against newer glib2
+Patch52: koffice-2.3.3-glib.patch
 
 ## upstream patches
 # backport support for libwpg 0.2 from Calligra master:
@@ -509,6 +511,7 @@ Requires:       libxml2-devel
 %setup -q
 %patch50 -p1 -b .gcc46
 %patch51 -p1 -b .no-qdebug-pixmap
+%patch52 -p1 -b .glib
 %patch100 -p1 -b .libwpg02
 %patch101 -p0 -b .kexi_fix_inserting_required_value
 %patch102 -p0 -b .kexi_fix_form_color_properties
@@ -1220,6 +1223,9 @@ fi
 
 
 %changelog
+* Fri Nov 04 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-17
+- fix FTBFS against newer glib2
+
 * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> - 3:2.3.3-16
 - rebuild(poppler)