--- a/ChangeLog	Wed Jun 13 07:37:27 2007 +0000
+++ b/ChangeLog	Wed Jun 13 12:26:30 2007 +0000
@@ -1,13 +1,20 @@
+2007-06-13  Matt Keenan  <[email protected]>
+
+	* base-specs/yelp.spec : Add patch to fix bugster:6560664, bugzilla:447107
+	  Yelp crashing becuase of malformed .so reference macro in man page
+	  rendering.
+	* patches/yelp-03-macro-reference-crash.diff : New patch
+
 2007-06-13  Dave Lin  <[email protected]>
 
-        * ext-sources/firefox.desktop:
-        * ext-sources/thunderbird.desktop: Remove version information from 
+	* ext-sources/firefox.desktop:
+	* ext-sources/thunderbird.desktop: Remove version information from 
 	  menu file since it's useless(CR#6564831) 
 
 2007-06-13  Padraig O'Briain  <[email protected]>
 
 	* base-libs/avahi.spec: Add this file. I seem to have forgotten to 
-        commit this yesterday.
+	  commit this yesterday.
 
 2007-06-13  Damien Carbery <[email protected]>
 

--- a/base-specs/yelp.spec	Wed Jun 13 07:37:27 2007 +0000
+++ b/base-specs/yelp.spec	Wed Jun 13 12:26:30 2007 +0000
@@ -20,6 +20,8 @@
 Patch1:       yelp-01-null-frag-id.diff
 # date:2007-04-10 type:bug owner:mattman bugster:6534411 bugzilla:428273
 Patch2:       yelp-02-empty-contents-list.diff
+# date:2007-06-13 type:bug owner:mattman bugster:6560664 bugzilla:447107
+Patch3:       yelp-03-macro-reference-crash.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -73,6 +75,7 @@
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifos linux
@@ -128,6 +131,9 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Wed Jun 13 2007 - [email protected]
+- Fix crash for #6560664 patch in bugzilla #447107
+
 * Thu Apr 12 2007 - [email protected]
 - Bump to 2.18.1.
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/yelp-03-macro-reference-crash.diff	Wed Jun 13 12:26:30 2007 +0000
@@ -0,0 +1,17 @@
+--- yelp-2.18.1.old/src/yelp-man-parser.c	2007-06-13 13:00:49.672288000 +0100
++++ yelp-2.18.1/src/yelp-man-parser.c	2007-06-13 13:00:38.749792000 +0100
+@@ -737,11 +737,10 @@
+ 	if (args && args->data) {
+ 	    basename = g_strrstr((const gchar *)args->data, "/");
+ 
+-	    basename++;
+-	    
+-	    if (basename)
++	    if (basename) {
++		basename++;
+ 		link = g_strdup_printf ("man:%s", basename);
+-	    else {
++	    } else {
+ 		link = g_strdup_printf ("man:%s", (const gchar *)args->data);
+ 		basename = (gchar *)args->data;
+ 	    }