From 3d693b9404b793e15e5bcdaa070ce54773d6f6c85a24e105445cc6e7bf49e136 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 26 Sep 2007 13:05:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=13 --- file-roller-2.20.0-correct-help-uri.patch | 47 +++++++++++++++++++++++ file-roller.changes | 6 +++ file-roller.spec | 8 +++- 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 file-roller-2.20.0-correct-help-uri.patch diff --git a/file-roller-2.20.0-correct-help-uri.patch b/file-roller-2.20.0-correct-help-uri.patch new file mode 100644 index 0000000..7460906 --- /dev/null +++ b/file-roller-2.20.0-correct-help-uri.patch @@ -0,0 +1,47 @@ +diff -upr file-roller-2.20.0-pre/src/gtk-utils.c file-roller-2.20.0-work/src/gtk-utils.c +--- file-roller-2.20.0-pre/src/gtk-utils.c 2007-09-17 14:40:06.000000000 -0500 ++++ file-roller-2.20.0-work/src/gtk-utils.c 2007-09-25 21:20:00.000000000 -0500 +@@ -798,39 +798,19 @@ show_help_dialog (GtkWindow *parent, + { + GError *err = NULL; + char *command; +- const char *lang; +- char *uri = NULL; +- int i; + GdkScreen *gscreen; + +- const char * const * langs = g_get_language_names (); +- +- for (i = 0; langs[i]; i++) { +- lang = langs[i]; +- if (strchr (lang, '.')) { +- continue; +- } +- +- uri = g_build_filename(FR_DATADIR, +- "/gnome/help/file-roller/", +- lang, +- "/file-roller.xml", +- NULL); +- +- if (g_file_test (uri, G_FILE_TEST_EXISTS)) { +- break; +- } +- } +- + if (link_id) { +- command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); ++ command = g_strconcat ("gnome-open ghelp://file-roller#", link_id, NULL); + } else { +- command = g_strconcat ("gnome-open ghelp://", uri, NULL); ++ command = g_strdup ("gnome-open ghelp://file-roller"); + } + + gscreen = gdk_screen_get_default(); + gdk_spawn_command_line_on_screen (gscreen, command, &err); + ++ g_free (command); ++ + if (err != NULL) { + GtkWidget *dialog; + diff --git a/file-roller.changes b/file-roller.changes index a5e11a5..0c385dc 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 26 04:45:31 CEST 2007 - hpj@suse.de + +- Add file-roller-2.20.0-correct-help-uri.patch, which fixes a + broken help path. + ------------------------------------------------------------------- Wed Sep 19 03:27:29 CEST 2007 - mauro@suse.de diff --git a/file-roller.spec b/file-roller.spec index 317c3b3..707006c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -15,7 +15,7 @@ BuildRequires: docbook-xsl-stylesheets fdupes gnome-doc-utils-devel gnome-patch License: GPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 1 +Release: 6 Requires: %{name}-lang = %{version} Summary: An Archive Manager for GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 @@ -24,6 +24,7 @@ Patch1: fr_59941.diff Patch2: file-roller-2.12.2-no-cmdline-overflow.patch Patch3: bug-187126_file-roller-batch-extract-all.patch Patch4: abuild.patch +Patch5: file-roller-2.20.0-correct-help-uri.patch Url: http://fileroller.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -75,6 +76,7 @@ gnome-patch-translation-prepare %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build @@ -127,8 +129,10 @@ fi %{_libdir}/nautilus/extensions-*/*.so %files lang -f %name.lang - %changelog +* Wed Sep 26 2007 - hpj@suse.de +- Add file-roller-2.20.0-correct-help-uri.patch, which fixes a + broken help path. * Wed Sep 19 2007 - mauro@suse.de - Update to version 2.20.0 * Fixed bug #473158 – ask-password.glade is missing