rpms/yelp/F-8 rarian-crash.patch,NONE,1.1 yelp.spec,1.112,1.113

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/yelp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214

Modified Files:
	yelp.spec 
Added Files:
	rarian-crash.patch 
Log Message:
fix a crash


rarian-crash.patch:

--- NEW FILE rarian-crash.patch ---
diff -up yelp-2.20.0/src/yelp-window.c.rarian-crash yelp-2.20.0/src/yelp-window.c
--- yelp-2.20.0/src/yelp-window.c.rarian-crash	2007-11-04 22:50:04.000000000 -0500
+++ yelp-2.20.0/src/yelp-window.c	2007-11-04 22:51:25.000000000 -0500
@@ -1584,9 +1584,9 @@ window_do_load_html (YelpWindow    *wind
 	goto done;
     }
 
-    base_uri = g_filename_to_uri (real_uri, NULL, NULL);
+    base_uri = g_filename_to_uri (uri, NULL, NULL);
     if (frag_id) {
-	real_uri = g_strconcat (base_uri, "#", frag_id);
+	real_uri = g_strconcat (base_uri, "#", frag_id, NULL);
 	g_free (base_uri);
     } else {
 	real_uri = base_uri;


Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-8/yelp.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- yelp.spec	24 Oct 2007 02:31:02 -0000	1.112
+++ yelp.spec	5 Nov 2007 04:06:45 -0000	1.113
@@ -20,13 +20,15 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
 Patch3: yelp-2.15.91-use-pango.patch 
+# http://bugzilla.gnome.org/show_bug.cgi?id=493594 
+Patch4: rarian-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
@@ -84,6 +86,7 @@
 %patch1 -p1 -b .fedora-docs
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
+%patch4 -p1 -b .rarian-crash
 #%patch8 -p1 -b .posix-man
 
 %build
@@ -148,6 +151,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Sun Nov  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-3
+- Fix a crash when loading the rarian docs
+
 * Tue Oct 23 2007 Jeremy Katz <katzj at redhat.com> - 2.20.0-2
 - Rebuild against new firefox