rpms/abiword/devel abiword-2.6.4-desktop.patch, 1.1, 1.2 abiword.mime, 1.1, 1.2 abiword.spec, 1.77, 1.78

[Marc Maurer]

Author: uwog

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

Modified Files:
	abiword-2.6.4-desktop.patch abiword.mime abiword.spec 
Log Message:
- Add libsoup-devel BR
- Remove version from asio-devel BR
- Add libwpg-devel BR
- Register the .abicollab extension and mimetype



abiword-2.6.4-desktop.patch:

Index: abiword-2.6.4-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword-2.6.4-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abiword-2.6.4-desktop.patch	13 Jul 2008 19:26:38 -0000	1.1
+++ abiword-2.6.4-desktop.patch	19 Jun 2009 12:11:39 -0000	1.2
@@ -6,8 +6,7 @@ diff -u -r abiword-2.6.4.orig/abiword.de
  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;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;
-+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/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/x-abicollab;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/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect;
  Name=AbiWord
  GenericName=Word Processor
  Comment=Compose, edit, and view documents
-Only in abiword-2.6.4: abiword.desktop.orig


Index: abiword.mime
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.mime,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abiword.mime	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword.mime	19 Jun 2009 12:11:39 -0000	1.2
@@ -1,3 +1,5 @@
 application/x-abiword
 	ext: abw
 
+application/x-abicollab
+	ext: abicollab


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- abiword.spec	12 Jun 2009 18:35:54 -0000	1.77
+++ abiword.spec	19 Jun 2009 12:11:39 -0000	1.78
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -54,6 +54,7 @@ BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
+BuildRequires: libwpg-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
@@ -61,7 +62,8 @@ BuildRequires: link-grammar-devel >= 4.2
 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
 #BuildRequires: goffice04-devel
 BuildRequires: loudmouth-devel
-BuildRequires: asio-devel >= 0.3.8
+BuildRequires: asio-devel
+BuildRequires: libsoup-devel
 %endif
 
 %description -n libabiword
@@ -178,6 +180,12 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Fri Jun 19 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.4-2
+- Add libsoup-devel BR
+- Remove version from asio-devel BR
+- Add libwpg-devel BR
+- Register the .abicollab extension and mimetype
+
 * Thu Jun 11 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.4-1
 - New upstream release