diff --git a/.cvsignore b/.cvsignore index 8a3e484..a3412e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnucash-2.2.7.tar.bz2 +gnucash-2.2.8.tar.bz2 diff --git a/gnucash-2.2.7-glib2-int-key.patch b/gnucash-2.2.7-glib2-int-key.patch deleted file mode 100644 index 499a655..0000000 --- a/gnucash-2.2.7-glib2-int-key.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/register/register-gnome/gnucash-sheet.c~ 2008-01-07 20:05:28.000000000 -0500 -+++ src/register/register-gnome/gnucash-sheet.c 2008-12-04 16:01:47.000000000 -0500 -@@ -2367,7 +2367,8 @@ - sheet->width = 0; - sheet->height = 0; - -- sheet->cursor_styles = g_hash_table_new (g_str_hash, g_str_equal); -+ sheet->cursor_styles = g_hash_table_new_full (g_str_hash, g_str_equal, -+ g_free, NULL); - - sheet->blocks = g_table_new (sizeof (SheetBlock), - gnucash_sheet_block_construct, -@@ -2426,8 +2427,9 @@ - sheet->grid = item; - - /* some register data */ -- sheet->dimensions_hash_table = g_hash_table_new (g_int_hash, -- g_int_equal); -+ sheet->dimensions_hash_table = g_hash_table_new_full (g_int_hash, -+ g_int_equal, -+ g_free, NULL); - - /* The cursor */ - sheet->cursor = gnucash_cursor_new (sheet_group); ---- src/register/register-gnome/gnucash-style.c~ 2008-12-04 14:59:49.000000000 -0500 -+++ src/register/register-gnome/gnucash-style.c 2008-12-04 16:01:47.000000000 -0500 -@@ -48,6 +48,15 @@ - return &key; - } - -+static gpointer -+style_create_key (SheetBlockStyle *style) -+{ -+ static gint key; -+ -+ key = style->cursor->num_rows; -+ -+ return g_memdup(&key, sizeof(key)); -+} - - static void - cell_dimensions_construct (gpointer _cd, gpointer user_data) -@@ -103,7 +112,7 @@ - if (!dimensions) { - dimensions = style_dimensions_new (style); - g_hash_table_insert (sheet->dimensions_hash_table, -- style_get_key (style), dimensions); -+ style_create_key (style), dimensions); - } - - dimensions->refcount++; diff --git a/gnucash.spec b/gnucash.spec index 4817668..9736203 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,10 +1,10 @@ -%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas +%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas Name: gnucash Summary: Finance management application -Version: 2.2.7 +Version: 2.2.8 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 @@ -16,7 +16,6 @@ BuildRequires: libofx-devel, aqbanking-devel, guile-devel BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool Patch0: gnucash-quiet.patch -Patch1: gnucash-2.2.7-glib2-int-key.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -38,7 +37,6 @@ balanced books. %prep %setup -q %patch0 -p1 -%patch1 -p0 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build @@ -130,6 +128,9 @@ fi %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Tue Dec 16 2008 Bill Nottingham - 2.2.8-1 +- update to 2.2.8 + * Fri Dec 5 2008 Bill Nottingham - 2.2.7-2 - fix crash with glib-2.19 (#474511, ) diff --git a/sources b/sources index 8a1d19d..a4bb973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f3f324c274b136070b769aa10591ccf gnucash-2.2.7.tar.bz2 +79d37e4fa0c71722e093136655698924 gnucash-2.2.8.tar.bz2