- fix compilation with glib 2.32

- BR libgda-devel with fixed headers

Changed files:
    abiword.spec -> 1.203
    glib.patch -> 1.1

diff --git a/abiword.spec b/abiword.spec
index 07517529040640a9735eb2c8804e7dfce11d6f61..3ce99b9e798f94dc1f1d955ac19bea36f6369d9e 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -26,6 +26,7 @@ Patch1:               %{name}-mht.patch
 Patch2:                %{name}-libwpd.patch
 Patch3:                %{name}-link.patch
 Patch4:                %{name}-libpng15.patch
+Patch5:                glib.patch
 URL:           http://www.abisource.com/
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
 BuildRequires: autoconf
@@ -42,7 +43,7 @@ BuildRequires:        gtk+2-devel >= 2:2.12.0
 BuildRequires: gtkmathview-devel >= 0.7.6
 BuildRequires: gucharmap-devel >= 1.7.0
 %if %{with gda}
-BuildRequires: libgda-devel >= 1:1.2.3
+BuildRequires: libgda-devel >= 1:1.2.4-16
 BuildRequires: libgnomedb-devel >= 1:1.2.0
 %else
 Obsoletes:     abiword-plugin-gda
@@ -322,6 +323,7 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # use generic icon name
 %{__sed} -i -e 's|abiword_48.png|abiword.png|' Makefile.am

diff --git a/glib.patch b/glib.patch
new file mode 100644 (file)
index 0000000..75a5687
--- /dev/null
+++ b/glib.patch
@@ -0,0 +1,10 @@
+--- abiword-2.8.6/src/af/util/xp/ut_go_file.h.wiget    2012-03-29 15:50:57.933517971 +0200
++++ abiword-2.8.6/src/af/util/xp/ut_go_file.h  2012-03-29 15:51:06.500184500 +0200
+@@ -31,7 +31,6 @@
+ 
+ #include <glib.h>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS