rpms/abiword/devel abiword-2.7.6-desktop.patch, NONE, 1.1 abiword.spec, 1.84, 1.85 abiword-2.7.5-desktop.patch, 1.1, NONE

[Marc Maurer]

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28295

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.7.6-desktop.patch 
Removed Files:
	abiword-2.7.5-desktop.patch 
Log Message:
Re-add updated desktop patch



abiword-2.7.6-desktop.patch:

--- NEW FILE abiword-2.7.6-desktop.patch ---
diff -u -r abiword-2.7.6.orig/abiword.desktop abiword-2.7.6/abiword.desktop
--- abiword-2.7.6.orig/abiword.desktop	2009-06-21 15:28:21.000000000 +0200
+++ abiword-2.7.6/abiword.desktop	2009-07-05 14:11:02.000000000 +0200
@@ -6,7 +6,7 @@
 Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
 StartupNotify=true
 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;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
+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;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
 Name=AbiWord
 GenericName=Word Processor
 Comment=Compose, edit, and view documents


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- abiword.spec	5 Jul 2009 01:27:06 -0000	1.84
+++ abiword.spec	5 Jul 2009 12:45:56 -0000	1.85
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -27,7 +27,7 @@ while still remaining lean.
 Summary: Library for developing applications based on AbiWord's core
 Group: System Environment/Libraries
 Patch0: abiword-2.6.0-windowshelppaths.patch
-Patch1: abiword-2.7.5-desktop.patch
+Patch1: abiword-2.7.6-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
 %if %{olpc_build}
@@ -64,7 +64,7 @@ BuildRequires: asio-devel
 BuildRequires: libsoup-devel
 %endif
 
-%description -n libabiword
+%descripton -n libabiword
 Library for developing applications based on AbiWord's core.
 
 %package -n libabiword-devel
@@ -80,6 +80,7 @@ Includes and definitions for developing 
 %setup -q
 
 # patch abiword
+%patch1 -p1 -b .desktop
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
@@ -178,6 +179,8 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sun Jul 05 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.6-3
+- Re-add updated .desktop patch
 
 * Sun Jul 05 2009 Peter Robinson <pbrobinson at gmail.com> - 1:2.7.6-2
 - Remove old patch


--- abiword-2.7.5-desktop.patch DELETED ---