rpms/abiword/devel abiword-2.2.6-desktop.patch, NONE, 1.1 abiword.spec, 1.3, 1.4 abiword-2.2.1-desktop.patch, 1.1, NONE abiword-2.2.5-gcc4.patch, 1.1, NONE abiword-2.2.5-pt64.patch, 1.1, NONE abiword-2.2.5-virtdestr.patch, 1.1, NONE abiword-2.2.5-wvread.patch, 1.2, NONE

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.2.6-desktop.patch 
Removed Files:
	abiword-2.2.1-desktop.patch abiword-2.2.5-gcc4.patch 
	abiword-2.2.5-pt64.patch abiword-2.2.5-virtdestr.patch 
	abiword-2.2.5-wvread.patch 
Log Message:
Update AbiWord to 2.2.6



abiword-2.2.6-desktop.patch:

--- NEW FILE abiword-2.2.6-desktop.patch ---
--- abiword-2.2.6.orig/abi/abiword.desktop	2005-04-03 17:14:30.000000000 +0200
+++ abiword-2.2.6/abi/abiword.desktop	2005-04-04 02:09:01.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;
 Name=Word Processor
 Comment=AbiWord Word Processor
 Name[de]=Textverarbeitung


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- abiword.spec	15 Mar 2005 21:24:38 -0000	1.3
+++ abiword.spec	4 Apr 2005 11:40:22 -0000	1.4
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.2.5
-Release: 3
+Version: 2.2.6
+Release: 1
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -39,11 +39,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.1-desktop.patch
-Patch2: abiword-2.2.5-gcc4.patch
-Patch3: abiword-2.2.5-wvread.patch
-Patch4: abiword-2.2.5-virtdestr.patch
-Patch5: abiword-2.2.5-pt64.patch
+Patch1: abiword-2.2.6-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,10 +49,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .gcc4
-%patch3 -p1 -b .wvread
-%patch4 -p1 -b .virtdestr
-%patch5 -p1 -b .pt64
 
 %build
 cd abi
@@ -135,6 +127,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Apr 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.6-1
+- Drop the gcc4, wvread, virtdestr and pt64 patches
+- Update the desktop patch
+
 * Fri Mar 15 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-3
 - Fix 64bit build
 - Add virtual destructors to classes with virtual functions


--- abiword-2.2.1-desktop.patch DELETED ---


--- abiword-2.2.5-gcc4.patch DELETED ---


--- abiword-2.2.5-pt64.patch DELETED ---


--- abiword-2.2.5-virtdestr.patch DELETED ---


--- abiword-2.2.5-wvread.patch DELETED ---