From ba4886782dced0b3030d7e7a37157250a3a13384 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@fedoraproject.org>
Date: Mar 09 2009 17:06:50 +0000
Subject: Build fix


---

diff --git a/abiword-plugins-2.6.8-rindex.patch b/abiword-plugins-2.6.8-rindex.patch
new file mode 100644
index 0000000..103919e
--- /dev/null
+++ b/abiword-plugins-2.6.8-rindex.patch
@@ -0,0 +1,12 @@
+diff -u -r abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp
+--- abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp	2007-10-11 22:05:55.000000000 +0200
++++ abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp	2009-03-09 16:59:14.000000000 +0100
+@@ -551,7 +551,7 @@
+ 				UT_UTF8String *pCom1 =
+ 					const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1)));
+ 				printf(" Filename %s \n",pCom1->utf8_str());
+-				char *suffix = rindex (pCom1->utf8_str (), '.');
++				const char *suffix = static_cast<const char*>(rindex (pCom1->utf8_str (), '.'));
+ 
+ 				if (suffix != NULL)
+ 				{
diff --git a/abiword.spec b/abiword.spec
index bd56ed8..751ead6 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -30,6 +30,7 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.6.4-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
+Patch4: abiword-plugins-2.6.8-rindex.patch
 %if %{olpc_build}
 Patch100: abiword-2.6.4-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
@@ -93,6 +94,7 @@ Includes and definitions for developing with libabiword.
 # setup abiword-plugins
 %setup -q -T -b 1 -n abiword-plugins-%{version}
 %patch3 -p1 -b .boolean
+%patch4 -p1 -b .rindex
 
 # setup abiword extras
 %setup -q -T -b 2 -n abiword-extras-%{version}
@@ -214,6 +216,9 @@ update-desktop-database %{_datadir}/applications
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Mar 09 2009 Marc Maurer <uwog@abisource.com> - 1:2.6.8-2
+- Make g++ 4.4 and rindex friends again
+
 * Mon Mar 09 2009 Marc Maurer <uwog@abisource.com> - 1:2.6.8-1
 - New upstream release