Hello community, here is the log from the commit of package file-roller checked in at Wed Sep 26 15:05:16 CEST 2007. -------- --- GNOME/file-roller/file-roller.changes 2007-09-19 03:27:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/file-roller/file-roller.changes 2007-09-26 04:46:06.927119000 +0200 @@ -1,0 +2,6 @@ +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. + +------------------------------------------------------------------- New: ---- file-roller-2.20.0-correct-help-uri.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file-roller.spec ++++++ --- /var/tmp/diff_new_pack.KS2747/_old 2007-09-26 15:03:12.000000000 +0200 +++ /var/tmp/diff_new_pack.KS2747/_new 2007-09-26 15:03:12.000000000 +0200 @@ -15,7 +15,7 @@ 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 @@ 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 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build @@ -127,8 +129,10 @@ %{_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 ++++++ file-roller-2.20.0-correct-help-uri.patch ++++++ 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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org