rpms/yelp/devel yelp-2.13.2-new-mimetype-for-docbook-xml.patch, NONE, 1.1 yelp.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7290

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.13.2-new-mimetype-for-docbook-xml.patch 
Log Message:
- Patched to ensure that Yelp recognizes that it can handle the mimetype of the
  documentation as reported by gnomevfs (also #175880)


yelp-2.13.2-new-mimetype-for-docbook-xml.patch:
 yelp-utils.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yelp-2.13.2-new-mimetype-for-docbook-xml.patch ---
--- yelp-2.13.2/src/yelp-utils.c.new-mimetype-for-docbook-xml	2005-12-12 01:27:54.000000000 -0500
+++ yelp-2.13.2/src/yelp-utils.c	2005-12-16 12:21:30.000000000 -0500
@@ -551,7 +551,7 @@
     if (mime_type == NULL)
 	return YELP_DOC_TYPE_ERROR;
 
-    if (g_str_equal (mime_type, "text/xml"))
+    if (g_str_equal (mime_type, "text/xml") || g_str_equal (mime_type, "application/docbook+xml") || g_str_equal (mime_type, "application/xml"))
 	type = YELP_DOC_TYPE_DOCBOOK_XML;
     else if (g_str_equal (mime_type, "text/sgml"))
 	type = YELP_DOC_TYPE_DOCBOOK_SGML;


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- yelp.spec	16 Dec 2005 16:53:12 -0000	1.42
+++ yelp.spec	16 Dec 2005 17:42:38 -0000	1.43
@@ -18,6 +18,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
+Patch3: yelp-2.13.2-new-mimetype-for-docbook-xml.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
@@ -60,6 +61,7 @@
 %setup -q
 %patch1 -p1 -b .fedora-docs
 %patch2 -p1 -b .add-mime-handling
+%patch3 -p1 -b .new-mimetype-for-docbook-xml
 
 %build
 %configure --with-mozilla=mozilla --disable-man --disable-info --disable-schemas-install
@@ -110,6 +112,8 @@
 * Thu Dec 15 2005 David Malcolm <dmalcolm at redhat.com> - 2.13.2-2
 - Patched to include DocBook mimetype in desktop file, and added preun and post
   hooks to update-desktop-database (#175880)
+- Patched to ensure that Yelp recognizes that it can handle the mimetype of the
+  documentation as reported by gnomevfs (also #175880) 
 
 * Thu Dec 15 2005 Matthias Clasen <mclasen at redhat.com> 2.13.2-1
 - Update to 2.13.2