packages: abiword/abiword.spec, abiword/glib.patch (NEW)=?UTF-8?Q?=20?=- fix compilation ...
wiget
wiget at pld-linux.org
Thu Mar 29 17:51:30 CEST 2012
Author: wiget Date: Thu Mar 29 15:51:30 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- fix compilation with glib 2.32
- BR libgda-devel with fixed headers
---- Files affected:
packages/abiword:
abiword.spec (1.202 -> 1.203) , glib.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/abiword/abiword.spec
diff -u packages/abiword/abiword.spec:1.202 packages/abiword/abiword.spec:1.203
--- packages/abiword/abiword.spec:1.202 Wed Mar 28 09:26:52 2012
+++ packages/abiword/abiword.spec Thu Mar 29 17:51:24 2012
@@ -27,6 +27,7 @@
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
@@ -43,7 +44,7 @@
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
@@ -323,6 +324,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# use generic icon name
%{__sed} -i -e 's|abiword_48.png|abiword.png|' Makefile.am
@@ -495,6 +497,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.203 2012/03/29 15:51:24 wiget
+- fix compilation with glib 2.32
+- BR libgda-devel with fixed headers
+
Revision 1.202 2012/03/28 07:26:52 arekm
- release 8
================================================================
Index: packages/abiword/glib.patch
diff -u /dev/null packages/abiword/glib.patch:1.1
--- /dev/null Thu Mar 29 17:51:30 2012
+++ packages/abiword/glib.patch Thu Mar 29 17:51:25 2012
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/abiword/abiword.spec?r1=1.202&r2=1.203
More information about the pld-cvs-commit
mailing list