[yelp/f16] Fix default uri

[Matthias Clasen]

commit 7434cc08922ee045f862ce60c1eb3d34b4c36add
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 21 23:27:00 2011 -0400

    Fix default uri

 ...-Make-yelp-open-the-user-guide-by-default.patch |   39 ++++++++++++++++++++
 yelp.spec                                          |    8 ++++
 2 files changed, 47 insertions(+), 0 deletions(-)
---
diff --git a/0001-Make-yelp-open-the-user-guide-by-default.patch b/0001-Make-yelp-open-the-user-guide-by-default.patch
new file mode 100644
index 0000000..e65415a
--- /dev/null
+++ b/0001-Make-yelp-open-the-user-guide-by-default.patch
@@ -0,0 +1,39 @@
+From 314af678c4ff8427cc26381410022d06414ec8d9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 21 Sep 2011 23:24:00 -0400
+Subject: [PATCH] Make yelp open the user guide by default
+
+Yelp was trying to, but the default URI was still using the
+old ghelp scheme, whereas the user guide uses the help: scheme
+nowadays.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=659784
+---
+ src/yelp-application.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/yelp-application.c b/src/yelp-application.c
+index 1966500..a0a3604 100644
+--- a/src/yelp-application.c
++++ b/src/yelp-application.c
+@@ -40,7 +40,7 @@
+ #include "yelp-application.h"
+ #include "yelp-window.h"
+ 
+-#define DEFAULT_URI "ghelp:gnome-help"
++#define DEFAULT_URI "help:gnome-help"
+ 
+ static gboolean editor_mode = FALSE;
+ 
+@@ -389,7 +389,7 @@ yelp_application_command_line (GApplication            *application,
+     argv = g_application_command_line_get_arguments (cmdline, NULL);
+ 
+     if (argv[1] == NULL)
+-        open_uri (app, yelp_uri_new ("ghelp:gnome-help"), FALSE);
++        open_uri (app, yelp_uri_new (DEFAULT_URI), FALSE);
+ 
+     for (i = 1; argv[i]; i++)
+         open_uri (app, yelp_uri_new (argv[i]), FALSE);
+-- 
+1.7.6.2
+
diff --git a/yelp.spec b/yelp.spec
index ef1e053..bab03c1 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -6,6 +6,10 @@ Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/3.1/%{name}-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=659784
+Patch0: 0001-Make-yelp-open-the-user-guide-by-default.patch
+
+
 URL: http://live.gnome.org/Yelp
 License: GPLv2+
 Group: Applications/System
@@ -53,6 +57,7 @@ the libraries in the yelp-libs package.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -113,6 +118,9 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Sep 21 2011 Matthias Clasen <mclasen at redhat.com> - 1:3.1.4-2
+- Fix default uri
+
 * Tue Sep 20 2011 Matthias Clasen <mclasen at redhat.com> - 1:3.1.4-1
 - Update to 3.1.4