Hello community, here is the log from the commit of package gcalctool checked in at Sat Sep 15 11:59:49 CEST 2007. -------- --- GNOME/gcalctool/gcalctool.changes 2007-09-10 22:09:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcalctool/gcalctool.changes 2007-09-15 01:54:23.008494000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 15 01:53:54 CEST 2007 - hpj@suse.de + +- Add gcalctool-5.19.92-correct-help-uri.patch, which allows us + to find help residing in help-bundle/. + +------------------------------------------------------------------- New: ---- gcalctool-5.19.92-correct-help-uri.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcalctool.spec ++++++ --- /var/tmp/diff_new_pack.D12807/_old 2007-09-15 11:59:43.000000000 +0200 +++ /var/tmp/diff_new_pack.D12807/_new 2007-09-15 11:59:43.000000000 +0200 @@ -15,18 +15,18 @@ License: GPL v2 or later Group: Productivity/Scientific/Math Version: 5.19.92 -Release: 1 +Release: 4 Summary: A GNOME Calculator Application Source: ftp://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.9/%{name}-%{version}.tar.bz2 Patch1: gcalc_59753_59377_59378.patch Patch2: gcalctool-deprecated.patch -URL: http://www.gnome.org +Patch3: gcalctool-5.19.92-correct-help-uri.patch +Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-icon-theme %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif - %gconf_schemas_prereq %description @@ -64,6 +64,7 @@ %setup -q %patch1 -p1 %patch2 +%patch3 -p1 %build autoreconf -f -i @@ -86,7 +87,6 @@ %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst %if %suse_version > 1020 - %fdupes $RPM_BUILD_ROOT %endif @@ -94,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -111,6 +110,9 @@ %files lang -f %{name}.lang %changelog +* Sat Sep 15 2007 - hpj@suse.de +- Add gcalctool-5.19.92-correct-help-uri.patch, which allows us + to find help residing in help-bundle/. * Mon Sep 10 2007 - maw@suse.de - Update to version 5.19.92: + Cosmetic version bump. ++++++ gcalctool-5.19.92-correct-help-uri.patch ++++++ diff -upr gcalctool-5.19.92-pre/gcalctool/gtk.c gcalctool-5.19.92-post/gcalctool/gtk.c --- gcalctool-5.19.92-pre/gcalctool/gtk.c 2007-09-14 16:12:38.000000000 -0500 +++ gcalctool-5.19.92-post/gcalctool/gtk.c 2007-09-14 16:20:04.000000000 -0500 @@ -3714,35 +3714,12 @@ static void help_display(void) { GError *error = NULL; - char *command; - const char *lang; - char *uri = NULL; GdkScreen *gscreen; - int i; - - 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(PACKAGE_DATA_DIR, - "/gnome/help/gcalctool/", - lang, - "/gcalctool.xml", - NULL); - - if (g_file_test (uri, G_FILE_TEST_EXISTS)) { - break; - } - } - - command = g_strconcat ("gnome-open ghelp://", uri, NULL); gscreen = gdk_screen_get_default(); - gdk_spawn_command_line_on_screen (gscreen, command, &error); + gdk_spawn_command_line_on_screen (gscreen, + "gnome-open ghelp://gcalctool", + &error); if (error) { GtkWidget *d; @@ -3755,8 +3732,5 @@ help_display(void) g_error_free(error); error = NULL; } - - g_free (command); - g_free (uri); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de