rpms/abiword/FC-4 abiword-2.2.8-mailmerge.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 abiword.spec, 1.6, 1.7 sources, 1.4, 1.5

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10498

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.2.8-mailmerge.patch 
Log Message:
2.2.8 release



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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2005 17:50:50 -0000	1.4
+++ .cvsignore	6 Jun 2005 22:22:01 -0000	1.5
@@ -1 +1 @@
-abiword-2.2.7.tar.bz2
+abiword-2.2.8.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abiword.spec	23 May 2005 00:36:51 -0000	1.6
+++ abiword.spec	6 Jun 2005 22:22:01 -0000	1.7
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.2.7
-Release: 2
+Version: 2.2.8
+Release: 1
 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,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Jun 6 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.8-1
+- Update to 2.2.8
+- Fix build with mailmerge patch
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1:2.2.7-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2005 17:50:50 -0000	1.4
+++ sources	6 Jun 2005 22:22:01 -0000	1.5
@@ -1 +1 @@
-9c74bf00601fc4c8bb0667a1696803de  abiword-2.2.7.tar.bz2
+f6f58e6ea4720ca635ede7b7f13cf156  abiword-2.2.8.tar.bz2