Accepting request 147433 from GNOME:Apps

Update to 1.12.0 (forwarded request 147378 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/147433
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnumeric?expand=0&rev=70
This commit is contained in:
Stephan Kulow 2013-01-08 12:36:43 +00:00 committed by Git OBS Bridge
commit 5b8a0ccf90
5 changed files with 16 additions and 33 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96467a8b32d121af806b0fbfc01ebfcbeb3c05ed03345c5d4239d55fcaf5a47e
size 15146032

3
gnumeric-1.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111
size 15631708

View File

@ -1,24 +0,0 @@
From ffd85edb736177076d4b295ea283cca02def88c7 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 7 10:27:49 UTC 2013 - dimstar@opensuse.org
- Update to version 1.12.0:
+ Fix xlsx save problem (bgo#690203).
- Changes from version 1.11.91:
+ Update the Gnumeric manual.
+ Fix format problem.
- Drop gnumeric-missing-return.patch: fixed upstream.
-------------------------------------------------------------------
Tue Dec 18 22:01:00 UTC 2012 - crrodriguez@opensuse.org

View File

@ -17,16 +17,14 @@
Name: gnumeric
Version: 1.11.90
Version: 1.12.0
Release: 0
# FIXME: Enable gobject-introspection when build succeeds (bgo#684159)
Summary: Spreadsheet Application
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
Source0: http://download.gnome.org/sources/gnumeric/1.12/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libgda-devel
@ -40,7 +38,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.90
BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.0
BuildRequires: pkgconfig(libgsf-1) >= 1.14.24
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12
BuildRequires: pkgconfig(pango) >= 1.24.0
@ -110,7 +108,6 @@ for LNG in po/*.po ; do
sed -i "/^$LNG\$/d" po/LINGUAS
fi
done
%patch0 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"