rpms/abiword/devel abiword-2.2.8-mailmerge.patch, NONE, 1.1 abiword.spec, 1.7, 1.8

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7990

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.2.8-mailmerge.patch 
Log Message:
Mailmerge patch to fix the build



abiword-2.2.8-mailmerge.patch:

--- NEW FILE abiword-2.2.8-mailmerge.patch ---
diff -r -u abiword-2.2.8.orig/abi/src/wp/impexp/xp/ie_mailmerge.h abiword-2.2.8/abi/src/wp/impexp/xp/ie_mailmerge.h
--- abiword-2.2.8.orig/abi/src/wp/impexp/xp/ie_mailmerge.h	2005-01-23 15:37:50.000000000 +0100
+++ abiword-2.2.8/abi/src/wp/impexp/xp/ie_mailmerge.h	2005-06-06 22:28:30.000000000 +0200
@@ -28,6 +28,8 @@
 typedef UT_sint32 IEMergeType;
 #define IEMT_Unknown ((IEMergeType)-1)
 
+class IE_MailMerge;
+
 class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
 {
   friend class IE_MailMerge;


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abiword.spec	6 Jun 2005 18:45:27 -0000	1.7
+++ abiword.spec	6 Jun 2005 20:32:04 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.2.8
-Release: 1
+Release: 2
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -40,6 +40,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
+Patch2: abiword-2.2.8-mailmerge.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -49,6 +50,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .mailmerge
 
 %build
 cd abi
@@ -127,6 +129,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Jun 6 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.8-2
+- Fix build with mailmerge patch
+
 * Sun Jun 6 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.8-1
 - Update to 2.2.8