rpms/abiword/devel .cvsignore, 1.5, 1.6 abiword.spec, 1.8, 1.9 sources, 1.5, 1.6 abiword-2.2.8-mailmerge.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.2.8-mailmerge.patch 
Log Message:
Update to 2.2.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jun 2005 18:45:27 -0000	1.5
+++ .cvsignore	27 Jul 2005 23:46:58 -0000	1.6
@@ -1 +1 @@
-abiword-2.2.8.tar.bz2
+abiword-2.2.9.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abiword.spec	6 Jun 2005 20:32:04 -0000	1.8
+++ abiword.spec	27 Jul 2005 23:46:58 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.2.8
-Release: 2
+Version: 2.2.9
+Release: 1
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -40,7 +40,6 @@
 
 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
@@ -50,7 +49,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .mailmerge
 
 %build
 cd abi
@@ -129,6 +127,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jul 28 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.9-1
+- Update to 2.2.9
+- Drop the mailmerge patch again
+
 * Sun Jun 6 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.8-2
 - Fix build with mailmerge patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jun 2005 18:45:27 -0000	1.5
+++ sources	27 Jul 2005 23:46:58 -0000	1.6
@@ -1 +1 @@
-f6f58e6ea4720ca635ede7b7f13cf156  abiword-2.2.8.tar.bz2
+17fe5169f03643dd59c83af7cf1c448a  abiword-2.2.9.tar.bz2


--- abiword-2.2.8-mailmerge.patch DELETED ---