rpms/yelp/devel yelp-2.16.1-crash-fixes.patch, 1.1, 1.2 yelp.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	yelp-2.16.1-crash-fixes.patch yelp.spec 
Log Message:
improve fix


yelp-2.16.1-crash-fixes.patch:
 yelp-info-parser.c  |    3 +--
 yelp-search-pager.c |    9 +++++++++
 yelp-utils.c        |    4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

Index: yelp-2.16.1-crash-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp-2.16.1-crash-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yelp-2.16.1-crash-fixes.patch	30 Oct 2006 03:16:39 -0000	1.1
+++ yelp-2.16.1-crash-fixes.patch	30 Oct 2006 04:57:55 -0000	1.2
@@ -1,5 +1,5 @@
---- yelp-2.16.1/src/yelp-search-pager.c.crash-fixes	2006-10-29 23:15:25.000000000 -0500
-+++ yelp-2.16.1/src/yelp-search-pager.c	2006-10-29 23:15:37.000000000 -0500
+--- yelp-2.16.1/src/yelp-search-pager.c.crash-fixes	2006-08-30 08:32:32.000000000 -0400
++++ yelp-2.16.1/src/yelp-search-pager.c	2006-10-30 00:48:27.000000000 -0500
 @@ -1449,6 +1449,15 @@
      else
  	lang = "C";
@@ -16,8 +16,8 @@
      command = g_strconcat("scrollkeeper-get-content-list ", lang, NULL);
      
      if (g_spawn_command_line_sync (command, &content_list, &stderr_str, NULL, NULL)) {
---- yelp-2.16.1/src/yelp-utils.c.crash-fixes	2006-10-29 23:12:11.000000000 -0500
-+++ yelp-2.16.1/src/yelp-utils.c	2006-10-29 23:12:29.000000000 -0500
+--- yelp-2.16.1/src/yelp-utils.c.crash-fixes	2006-06-11 22:17:56.000000000 -0400
++++ yelp-2.16.1/src/yelp-utils.c	2006-10-30 00:48:27.000000000 -0500
 @@ -788,7 +788,9 @@
  
  	if (!g_spawn_command_line_sync ("manpath", &manp, NULL, NULL, NULL))
@@ -29,8 +29,17 @@
  	g_strstrip (manp);
  	manpath = g_strsplit (manp, ":", -1);
  
---- yelp-2.16.1/src/yelp-info-parser.c.crash-fixes	2006-10-29 23:16:11.000000000 -0500
-+++ yelp-2.16.1/src/yelp-info-parser.c	2006-10-29 23:16:20.000000000 -0500
+--- yelp-2.16.1/src/yelp-info-parser.c.crash-fixes	2006-08-28 15:35:50.000000000 -0400
++++ yelp-2.16.1/src/yelp-info-parser.c	2006-10-30 00:52:51.000000000 -0500
+@@ -1020,7 +1020,7 @@
+ 	  if (alt_append) append = alt_append;
+ 	  else append = alt_append1;
+ 	}
+-	if ((alt_append && alt_append < append) || broken)
++	if (alt_append && alt_append < append)
+ 	  append = alt_append;
+ 	if (alt_append1 && alt_append1 < append)
+ 	  append = alt_append1;
 @@ -1096,7 +1096,6 @@
  
  	    new_url = g_strdup (lurl);


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- yelp.spec	30 Oct 2006 03:16:39 -0000	1.82
+++ yelp.spec	30 Oct 2006 04:57:55 -0000	1.83
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -144,6 +144,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Sun Oct 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-4
+- Improve the previous fix
+
 * Sun Oct 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
 - Fix some crashes (#212888)