diff --git a/abiword-2.4.6-boolean.patch b/abiword-2.4.6-boolean.patch new file mode 100644 index 0000000..68f6e5e --- /dev/null +++ b/abiword-2.4.6-boolean.patch @@ -0,0 +1,36 @@ +--- abi/src/text/ptbl/xp/pd_Style.h.orig 2005-05-20 15:37:09.000000000 -0400 ++++ abi/src/text/ptbl/xp/pd_Style.h 2008-01-28 23:18:05.000000000 -0500 +@@ -21,6 +21,9 @@ + #ifndef PD_STYLE_H + #define PD_STYLE_H + ++#ifndef FALSE ++#define FALSE 0 ++#endif /* FALSE */ + #include "ut_types.h" + #include "pt_Types.h" + #include "ut_xml.h" +--- abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h.orig 2005-02-10 18:41:13.000000000 -0500 ++++ abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-01-29 00:11:38.000000000 -0500 +@@ -20,6 +20,9 @@ + #ifndef __LinkGrammarWrap_h__ + #define __LinkGrammarWrap_h__ + ++#ifndef TRUE ++#define TRUE 1 ++#endif /* TRUE */ + extern "C" { + #include + } +--- abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h.orig 2006-03-13 16:53:04.000000000 -0500 ++++ abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-01-29 00:14:48.000000000 -0500 +@@ -23,6 +23,9 @@ + #ifndef _ODI_STYLE_STYLE_H_ + #define _ODI_STYLE_STYLE_H_ + ++#ifndef TRUE ++#define TRUE 1 ++#endif /* TRUE */ + // Internal includes + #include "ODi_ListenerState.h" + diff --git a/abiword-2.4.6-goffice04.patch b/abiword-2.4.6-goffice04.patch new file mode 100644 index 0000000..697ad16 --- /dev/null +++ b/abiword-2.4.6-goffice04.patch @@ -0,0 +1,64 @@ +--- abiword-plugins/tools/abigochart/plugin.m4.goffice04 2006-10-31 16:25:11.000000000 -0500 ++++ abiword-plugins/tools/abigochart/plugin.m4 2008-01-29 01:24:13.000000000 -0500 +@@ -21,9 +21,9 @@ + + # Checks for GOfficeCharts + +-LIBGOffice_REQUIRED_VERSION=0.2.1 ++LIBGOffice_REQUIRED_VERSION=0.4.0 + +-PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[ ++PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION],[ + ABI_PLUGIN_REPORT([abigochart: okay]) + ],[ ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required]) + abi_plugin_disable=yes +--- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp.goffice04 2006-10-31 16:25:12.000000000 -0500 ++++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2008-01-29 01:48:06.000000000 -0500 +@@ -72,12 +72,13 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +@@ -190,8 +191,8 @@ + GOData *data = NULL; + double val; + char sep[2], col_sep[2], *end; +- sep[0] = format_get_arg_sep (); +- col_sep[0] = format_get_col_sep (); ++ sep[0] = go_locale_get_arg_sep (); ++ col_sep[0] = go_locale_get_col_sep (); + sep[1] = col_sep[1]= 0; + char const* str = gtk_entry_get_text (gee); + if (str == NULL) +@@ -1119,7 +1120,7 @@ + { + m_Graph = NULL; + m_Image = NULL; +- m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL)); ++ m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL)); + pix_width = pix_height = 0; + width = height = 0; + m_Guru = NULL; +@@ -1189,10 +1190,10 @@ + GdkPixbuf *pixbuf; + pix_width = _width; + pix_height = _height; +- gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0); ++ gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0); + if (m_Image) + delete m_Image; +- pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer)); ++ pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer)); + m_Image = new GR_UnixImage(NULL, pixbuf); + g_object_ref(pixbuf); + m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec); diff --git a/abiword.spec b/abiword.spec index cebcb91..59d0585 100644 --- a/abiword.spec +++ b/abiword.spec @@ -28,7 +28,7 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: link-grammar-devel >= 4.2.2 BuildRequires: gtkmathview-devel >= 0.7.5 -BuildRequires: goffice-devel >= 0.1.0 +BuildRequires: goffice04-devel # gnome build deps BuildRequires: libgnomeui-devel @@ -38,7 +38,8 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.6-fontmanager.patch Patch3: abiword-2.4.6-toc-layout.patch -Patch4: abiword-2.4.6-goffice06.patch +Patch4: abiword-2.4.6-boolean.patch +Patch5: abiword-2.4.6-goffice04.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -51,8 +52,9 @@ AbiWord full-featured, and remain lean. %patch2 -p1 -b .fontmanager %patch3 -p1 -b .toc-layout %if 0%{?fedora} >= 9 -%patch4 -p0 -b .goffice +%patch4 -p0 -b .boolean %endif +%patch5 -p0 -b .goffice04 %build cd abi @@ -81,7 +83,11 @@ ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.4 ./make-html.sh %install cd abi -make install +# Remove .cvsignore files +find . -name '.cvsignore' -exec rm -f {} ';' +make install DESTDIR=$RPM_BUILD_ROOT +# Fix script permission +chmod +x %{_datadir}/AbiSuite-2.4/AbiWord/scripts/abw2html.pl cd ../abiword-plugins make install DESTDIR=$RPM_BUILD_ROOT @@ -134,10 +140,12 @@ update-desktop-database %{_datadir}/applications %{_datadir}/icons/*png %changelog -* Mon Jan 28 2008 Michel Salim - 1:2.4.6-7 +* Tue Jan 29 2008 Michel Salim - 1:2.4.6-7 - Update license field - Remove build deps on g++ and libstdc++ (in minimum build environment) +- Remove .cvsignore files from installed doc; fix abw2html.pl permission - Add support for goffice-0.6 when building on Fedora 9 and above +- Fix for F9 glibc lacking TRUE and FALSE * Tue Sep 04 2007 Lubomir Kundrak - 1:2.4.6-6.fc7 - Fix 248103