Hello community, here is the log from the commit of package yelp for openSUSE:Factory checked in at Wed Feb 2 01:53:11 CET 2011. -------- --- GNOME/yelp/yelp.changes 2010-12-10 16:41:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2011-01-25 22:16:14.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 25 21:14:40 UTC 2011 - dimstar@opensuse.org + +- Add yelp-missing-slash.patch: fix issues with missing slashes + when opening help files. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- yelp-missing-slash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.ecQoQ7/_old 2011-02-02 01:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ecQoQ7/_new 2011-02-02 01:52:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yelp (Version 2.30.2) +# spec file for package yelp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,7 +50,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Version: 2.30.2 -Release: 2 +Release: 3 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -63,6 +63,8 @@ Patch6: yelp-2.13.5-use-susehelp.patch # PATCH-FEATURE-OPENSUSE yelp-handle-help-uri.patch vuntz@novell.com -- handle help: URI Patch9: yelp-handle-help-uri.patch +# PATCH-FIX-UPSTREAM yelp-missing-slash.patch dimstar@opensuse.org - Use g_build_filename to avoid missing slash problem, taken from git. +Patch10: yelp-missing-slash.patch Provides: suse_help_viewer Requires: %{name}-lang = %{version} # We need the stylesheets from gnome-doc-utils @@ -85,6 +87,7 @@ %patch1 -p1 %patch6 -p1 %patch9 -p1 +%patch10 -p1 %build %configure ++++++ yelp-missing-slash.patch ++++++
From d8a0c136b10d174beae8fd5cfeeb83ef18e83846 Mon Sep 17 00:00:00 2001 From: Shaun McCance
Date: Thu, 18 Nov 2010 16:41:43 +0000 Subject: [yelp-utils] Use g_build_filename to avoid missing slash problem
We were assuming the results of g_get_system_data_dirs have a trailing slash. They might not, if you set XDG_DATA_DIRS without them. --- diff --git a/src/yelp-utils.c b/src/yelp-utils.c index 7fb79e5..0027e08 100644 --- a/src/yelp-utils.c +++ b/src/yelp-utils.c @@ -116,15 +116,15 @@ resolve_process_ghelp (char *uri, gchar **result) hash = NULL; } for (i = 0; type != YELP_RRN_TYPE_MAL && dirs[i]; i++) { - gchar *path = g_strdup_printf ("%sgnome/help/%s", dirs[i], dir); + gchar *path = g_build_filename (dirs[i], "gnome", "help", dir, NULL); if (g_file_test (path, G_FILE_TEST_IS_DIR)) { const gchar * const *langs = g_get_language_names (); gint j; for (j = 0; type != YELP_RRN_TYPE_MAL && langs[j]; j++) { - gchar *index = g_strdup_printf ("%sgnome/help/%s/%s/index.page", dirs[i], dir, langs[j]); + gchar *index = g_build_filename (dirs[i], "gnome", "help", dir, langs[j], "index.page", NULL); if (g_file_test (index, G_FILE_TEST_IS_REGULAR)) { type = YELP_RRN_TYPE_MAL; - *result = g_strdup_printf ("%sgnome/help/%s/%s/", dirs[i], dir, langs[j]); + *result = g_build_filename (dirs[i], "gnome", "help", dir, langs[j], NULL); } g_free (index); } -- cgit v0.8.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org