rpms/abiword/FC-5 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 abiword.spec, 1.32, 1.33 sources, 1.13, 1.14 abiword-2.4.2-desktop.patch, 1.1, NONE abiword-2.4.2-macros.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.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/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
+++ .cvsignore	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- abiword.spec	8 Mar 2006 22:43:40 -0000	1.32
+++ abiword.spec	10 Apr 2006 23:35:23 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 7%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -134,6 +132,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc5
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Wed Mar 08 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-7.fc5
 - Disable the collaboration plugin; it is not working in 2.4.x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 14:57:02 -0000	1.13
+++ sources	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---