rpms/abiword/FC-4 abiword-2.4.2-desktop.patch, NONE, 1.1 abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 abiword.spec, 1.19, 1.20 sources, 1.9, 1.10 abiword-2.2.6-desktop.patch, 1.1, NONE abiword-2.4.1-gsf.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -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;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor

abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2005 19:55:56 -0000	1.9
+++ .cvsignore	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- abiword.spec	30 Dec 2005 21:32:37 -0000	1.19
+++ abiword.spec	5 Jan 2006 15:29:38 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 5%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -46,8 +46,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.4.1-gsf.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -57,7 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .gsf
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -141,6 +141,12 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc4
+- Update to 2.4.2;
+- Drop the gsf patch
+- Update the desktop patch
+- Add a plugins macros patch
+
 * Fri Dec 30 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-5.fc4
 - Add BuildRequires readline-devel for the AbiCommand plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2005 19:55:56 -0000	1.9
+++ sources	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---


--- abiword-2.4.1-gsf.patch DELETED ---