diff --git a/gnumeric-1.11.6.tar.xz b/gnumeric-1.11.6.tar.xz deleted file mode 100644 index b9a5d54..0000000 --- a/gnumeric-1.11.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fcc37d52a49eeb020653bd4c9561f8dbe8bbdb0452fc535bcadb15bb00a0385 -size 14715156 diff --git a/gnumeric-1.11.90.tar.xz b/gnumeric-1.11.90.tar.xz new file mode 100644 index 0000000..7829c84 --- /dev/null +++ b/gnumeric-1.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96467a8b32d121af806b0fbfc01ebfcbeb3c05ed03345c5d4239d55fcaf5a47e +size 15146032 diff --git a/gnumeric-missing-return.patch b/gnumeric-missing-return.patch new file mode 100644 index 0000000..6f795c6 --- /dev/null +++ b/gnumeric-missing-return.patch @@ -0,0 +1,24 @@ +From ffd85edb736177076d4b295ea283cca02def88c7 Mon Sep 17 00:00:00 2001 +From: Morten Welinder +Date: Mon, 19 Nov 2012 21:32:24 +0000 +Subject: Cell format: actually return the intended result. + +--- +(limited to 'src/cell.c') + +diff --git a/src/cell.c b/src/cell.c +index 68991e7..77b9988 100644 +--- a/src/cell.c ++++ b/src/cell.c +@@ -955,7 +955,7 @@ gnm_cell_get_format_given_style (GnmCell const *cell, GnmStyle const *style) + GOFormat const * + gnm_cell_get_format (GnmCell const *cell) + { +- gnm_cell_get_format_given_style (cell, NULL); ++ return gnm_cell_get_format_given_style (cell, NULL); + } + + /* +-- +cgit v0.9.0.2 + diff --git a/gnumeric.changes b/gnumeric.changes index cfb5bce..0989c1a 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue Dec 11 09:27:26 UTC 2012 - vuntz@opensuse.org + +- Update to version 1.11.90: + + ODF import/export improvements (bgo#662057, bgo#683739, + bgo#686789, bgo#687243, bgo#687693) + + Fix encounter with macro sheets on xls import (bgo#684646) + + Fix xlsx save performance problems (bgo#662058, bgo#685530) + + Save all settings in stf export (bgo#685077) + + Fix cell overflow in case of marked up scientific format + (bgo#686540) + + Fixed indentation in cell format dialog (bgo#683576) + + Do not use filtered out values in graphs (bgo#687209) + + Fixed crash on interprocess image copying (bgo#687414) + + Fix sheet focus after resizing (bgo#687188) + + Unselect sheet objects on closing to avoid leaks (bgo#688094) + + Make .gnumeric use fewer style rectangles for the same style. + + Short-circuit column resize for large stf imports (bgo#686858) + + Enhance POWER to do root of negative numbers (bgo#687269) + + Fix interaction with ibus & fcitx (bgo#684511) + + Fixed introspection annotations (bgo#682514) +- Add gnumeric-missing-return.patch: fix missing return value. + ------------------------------------------------------------------- Sun Sep 16 16:19:17 UTC 2012 - dimstar@opensuse.org diff --git a/gnumeric.spec b/gnumeric.spec index d5b500f..66aee2c 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.11.6 +Version: 1.11.90 Release: 0 # FIXME: Enable gobject-introspection when build succeeds (bgo#684159) Summary: Spreadsheet Application @@ -25,6 +25,8 @@ License: GPL-2.0 or GPL-3.0 Group: Productivity/Office/Spreadsheets Url: http://www.gnumeric.org/ Source0: http://download.gnome.org/sources/gnumeric/1.11/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnumeric-missing-return.patch vuntz@opensuse.org -- Fix missing return value, taken from git +Patch0: gnumeric-missing-return.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libgda-devel @@ -38,7 +40,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 # gobject introspection currently disabled... build fails #BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.0.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 -BuildRequires: pkgconfig(libgoffice-0.10) >= 0.9.6 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.9.90 BuildRequires: pkgconfig(libgsf-1) >= 1.14.24 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 BuildRequires: pkgconfig(pango) >= 1.24.0 @@ -109,6 +111,7 @@ for LNG in po/*.po ; do sed -i "/^$LNG\$/d" po/LINGUAS fi done +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing"