Up to 1.12.2

Added am13.patch to workaround automake restriction
Added gsf.patch to fix compilation

diff --git a/am13.patch b/am13.patch
new file mode 100644 (file)
index 0000000..1a200fa
--- /dev/null
+++ b/am13.patch
@@ -0,0 +1,52 @@
+From df890b18fad6ea250b4a44cdbfbbdff947648041 Mon Sep 17 00:00:00 2001
+From: Morten Welinder <terra@gnome.org>
+Date: Mon, 10 Jun 2013 19:49:20 +0000
+Subject: tests: work around problems with automake 1.13
+
+---
+diff --git a/configure.ac b/configure.ac
+index 3e7413e..cae2146 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1036,6 +1036,9 @@ AC_ARG_WITH([typelib-dir],
+ )
+ AC_SUBST(TYPELIBDIR)
+ 
++AC_SUBST([auto_find_tests], ['$(sort $(wildcard $(srcdir)/t[[0-9]][[0-9]][[0-9]][[0-9]]-*.pl))']) 
++
++
+ dnl **************************************************
+ dnl * Config defaults
+ dnl **************************************************
+diff --git a/test/ChangeLog b/test/ChangeLog
+index cc9b478..952552f 100644
+--- a/test/ChangeLog
++++ b/test/ChangeLog
+@@ -1,3 +1,8 @@
++2013-06-10  Morten Welinder  <terra@gnome.org>
++
++      * Makefile.am (TESTS): Work around automake problems with
++      wildcards by going via configure.
++
+ 2013-04-26  Morten Welinder <terra@gnome.org>
+ 
+       * Release 1.12.2
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 6b7ee15..f44986d 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -25,7 +25,11 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++# This is a working for automake's problem with wildcards.  See
++# http://permalink.gmane.org/gmane.comp.sysutils.automake.bugs/7413
++TESTS_EXTENSIONS=.pl
++TESTS = @auto_find_tests@
++
+ SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:
+--
+cgit v0.9.2

diff --git a/gnumeric.spec b/gnumeric.spec
index 4a9d329b5bc51d58e987ea00c9cd4b86b878ac8c..4aafa4bfff5d59cf71e7b4671be0c1ab12b29ec6 100644 (file)
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -18,13 +18,15 @@ Summary(ru.UTF-8):  Электронные таблицы для GNOME
 Summary(uk.UTF-8):     Електронні таблиці для GNOME
 Summary(zh_CN.UTF-8):  Linux下的Excel -- GNOME电子表格
 Name:          gnumeric
-Version:       1.11.90
-Release:       2
+Version:       1.12.2
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.11/%{name}-%{version}.tar.xz
-# Source0-md5: 843970b6d2e1491fe2a09047ac215dd8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/%{name}-%{version}.tar.xz
+# Source0-md5: 711daa98da0138203fb2f8dc4dcddb3c
+Patch0:                am13.patch
+Patch1:                gsf.patch
 URL:           http://projects.gnome.org/gnumeric/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: ORBit2-devel >= 1:2.14.0
@@ -37,7 +39,7 @@ BuildRequires:        glib2-devel >= 1:2.12.0
 BuildRequires: gnome-common >= 2.12.0
 BuildRequires: gtk+3-devel
 BuildRequires: intltool >= 0.35
-BuildRequires: libgoffice-devel >= 0.9.90
+BuildRequires: libgoffice-devel >= 0.10.2
 %if %{with gda}
 BuildRequires: libgda4-devel >= 4.1.1
 BuildRequires: libgnomedb4-devel >= 3.99.6
@@ -442,6 +444,8 @@ Wtyczka dla goffice.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gnome_doc_common}
@@ -530,6 +534,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/gnumeric.1*
 %{_mandir}/man1/ssconvert.1*
+%{_mandir}/man1/ssdiff.1*
 %{_mandir}/man1/ssgrep.1*
 %{_mandir}/man1/ssindex.1*
 

diff --git a/gsf.patch b/gsf.patch
new file mode 100644 (file)
index 0000000..a035fcf
--- /dev/null
+++ b/gsf.patch
@@ -0,0 +1,11 @@
+--- gnumeric-1.12.2/src/print-info.c.wiget     2013-06-11 15:09:03.193548964 +0200
++++ gnumeric-1.12.2/src/print-info.c   2013-06-11 15:10:11.820796976 +0200
+@@ -29,6 +29,8 @@
+ #include "sheet-object-graph.h"
+ 
+ #include <goffice/goffice.h>
++#include <gsf/gsf-doc-meta-data.h>
++#include <gsf/gsf-meta-names.h>
+ 
+ #include <glib/gi18n-lib.h>
+ #include <string.h>