--- a/ChangeLog	Tue Dec 04 15:09:01 2007 +0000
+++ b/ChangeLog	Tue Dec 04 16:35:32 2007 +0000
@@ -1,3 +1,12 @@
+2007-12-04  Matt Keenan <[email protected]>
+
+	* base-specs/yelp.spec : Add patch to fix yelp search crasher :
+	  bugster:6630773, bugzilla:501559.
+	* patches/yelp-03-search-crash-v2.diff : Patch to fix
+	  bugster:6630773, bugzilla:501559.
+	* patches/yelp-02-search-crash.diff : Re-Apply patch for new tarball
+	  so to have no offsetting when applied.
+
 2007-12-04  Damien Carbery <[email protected]>
 
 	* patches/evolution-02-display-mail.diff: Rework for new tarball.

--- a/base-specs/yelp.spec	Tue Dec 04 15:09:01 2007 +0000
+++ b/base-specs/yelp.spec	Tue Dec 04 16:35:32 2007 +0000
@@ -20,6 +20,8 @@
 Patch1:       yelp-01-va-args.diff
 # date:2007-10-18 owner:mattman type:bug bugster:6610215 bugzilla:493751
 Patch2:       yelp-02-search-crash.diff
+# date:2007-12-04 owner:mattman type:bug bugster:6630773 bugzilla:501559
+Patch3:       yelp-03-search-crash-v2.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -72,6 +74,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifos linux
@@ -127,6 +130,9 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Tue Dec 04 2007 - [email protected]
+- Add patch 03-search-crash-v2 fix bugster:6630773 bugzilla:501559
+
 * Tue Dec 04 2007 - [email protected]
 - Bump to 2.21.1.
 

--- a/patches/yelp-02-search-crash.diff	Tue Dec 04 15:09:01 2007 +0000
+++ b/patches/yelp-02-search-crash.diff	Tue Dec 04 16:35:32 2007 +0000
@@ -1,6 +1,6 @@
---- yelp-2.20.0.old/src/yelp-search-parser.c	2007-10-17 17:19:10.972320000 +0000
-+++ yelp-2.20.0/src/yelp-search-parser.c	2007-10-17 17:20:35.358465000 +0000
-@@ -1057,6 +1057,9 @@
+--- yelp-2.21.1.old/src/yelp-search-parser.c	2007-12-04 16:30:24.861963000 +0000
++++ yelp-2.21.1/src/yelp-search-parser.c	2007-12-04 16:31:46.203271000 +0000
+@@ -1061,6 +1061,9 @@
  	fname = reg->uri;
      }