From d197fb223accd5785d90373413589ad6cdb180be Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 4 Aug 2011 00:32:18 +0100
Subject: [PATCH] rebuild for new asio, drop obsolete OLPC and ARM includes

---
 abiword.spec | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index e983cb9..d9491fa 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -2,12 +2,10 @@
 %define minorversion 8
 %define microversion 6
 
-%define olpc_build 0
-
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -30,11 +28,6 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-%if %{olpc_build}
-Patch100: abiword-2.6.4-defaultfont.patch
-Patch101: abiword-2.6.4-draghandles.patch
-Patch102: abiword-2.6.4-nohtmloptions.patch
-%endif
 Patch103: abiword-2.8.6-libwpd.patch
 Patch104: abiword-2.8.6-no-undefined.patch
 
@@ -45,9 +38,6 @@ BuildRequires: zlib-devel, popt-devel, libpng-devel
 BuildRequires: gtk2-devel, libgsf-devel
 BuildRequires: boost-devel, t1lib-devel
 BuildRequires: dbus-glib-devel >= 0.70
-%if !%{olpc_build}
-# don't require link-grammar until it is revived
-#Requires: link-grammar >= 4.2.2
 BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
@@ -61,11 +51,8 @@ BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
 #BuildRequires: link-grammar-devel >= 4.2.2
 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
 BuildRequires: loudmouth-devel
-%ifnarch %{arm}
 BuildRequires: asio-devel
-%endif
 BuildRequires: libsoup-devel
-%endif
 
 %description -n libabiword
 Library for developing applications based on AbiWord's core.
@@ -87,11 +74,6 @@ Includes and definitions for developing with libabiword.
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
-%if %{olpc_build}
-%patch100 -p1 -b .defaultfont
-%patch101 -p1 -b .draghandles
-%patch102 -p1 -b .nohtmloptions
-%endif
 %patch103 -p0 -b .libwpd
 %patch104 -p1 -b .no-undefined
 
@@ -107,12 +89,8 @@ Includes and definitions for developing with libabiword.
 cd $RPM_BUILD_DIR/abiword-%{version}
 # we need to update the generated configuration files because of patch104
 autoreconf --force --install
-%if %{olpc_build}
-%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
-%else
 %configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates
-%endif
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 # build the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -190,6 +168,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Tue Aug  3 2011 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-13
+- rebuild for new asio
+- drop obsolete OLPC and ARM includes
+
 * Tue Aug 02 2011 Marc Maurer <uwog@abisource.com> - 1:2.8.6-12
 - Fix a typo in the previous patch