diff --git a/gnumeric-1.12.0.tar.xz b/gnumeric-1.12.0.tar.xz deleted file mode 100644 index bcd90f7..0000000 --- a/gnumeric-1.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 -size 15631708 diff --git a/gnumeric-1.12.1.tar.xz b/gnumeric-1.12.1.tar.xz new file mode 100644 index 0000000..526a8c0 --- /dev/null +++ b/gnumeric-1.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901 +size 15692328 diff --git a/gnumeric-configure.patch b/gnumeric-configure.patch new file mode 100644 index 0000000..ba764a5 --- /dev/null +++ b/gnumeric-configure.patch @@ -0,0 +1,27 @@ +diff --git a/configure.ac b/configure.ac +index fa55a76..13aba8e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -245,6 +245,11 @@ AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal$ac_exeext, glib-genmarshal$ac_exe + AC_ARG_VAR(GDK_PIXBUF_CSOURCE, [The gdk-pixbuf-csource executable.]) + AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource$ac_exeext, gdk-pixbuf-csource$ac_exeext) + ++AC_SUBST(GETTEXT_PACKAGE, gnumeric) ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ++ [The package name, for gettext]) ++AM_GLIB_GNU_GETTEXT ++ + ## this should come after `AC_PROG_CC' + ifdef([GNOME_COMPILE_WARNINGS], + [GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS", +@@ -502,10 +507,6 @@ for lang in $ALL_LINGUAS; do + done + AC_SUBST(POFILES_FULL) + +-AC_SUBST(GETTEXT_PACKAGE, gnumeric) +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", +- [The package name, for gettext]) +-AM_GLIB_GNU_GETTEXT + dnl + dnl Code to handle po-functions/Makefile* and po-functions/POTFILES* + dnl diff --git a/gnumeric.changes b/gnumeric.changes index 9d730e6..d2dd171 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Mar 19 23:13:12 UTC 2013 - dimstar@opensuse.org + +- Update to version 1.12.1: + + Introspection fixes (bgo#684159). + + Some documentation fixes. + + Show argument names for python functions (bgo##690681). + + Fix loading of ODF files with named expressions (bgo#690925). + + Avoid unncessary sheet specification in analysis tools + (bgo#691892). + + Fix sensitivity tests for 2-factor anova dialog (bgo#693980). + + Fixed aspect ratio for graph sheets (bgo#691472). + + Replaced all GtkTable instances by GtkGrid. + + Make the row and column header clickable even when indented. + + Fix horizontal and vertical pane positions after indentation. + + Fix a few compiler warnings.Fix a few compiler warnings. + + Always compile ssconvert, ssindex, and ssgrep. + + New utility: ssdiff. + + Remove disabled corba plugin. + + Other bugs fixed: bgo#690929, bgo#687926, bgo#109442, + bgo#625544, bgo#691913, bgo#691984, bgo#654495, bgo#674954, + bgo#693761, bgo#694741, bgo#694777, bgo#364291. +- Add gnumeric-configure.patch: Fix instal location of locale + files. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + above patch touches the build system. +- Reenable pkgconfig(gobject-introspection-1.0) BuildRequires: + gobject-introspection building has been corrected. + ------------------------------------------------------------------- Mon Jan 7 10:27:49 UTC 2013 - dimstar@opensuse.org diff --git a/gnumeric.spec b/gnumeric.spec index 26131ca..88cda6d 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.12.0 +Version: 1.12.1 Release: 0 # FIXME: Enable gobject-introspection when build succeeds (bgo#684159) Summary: Spreadsheet Application @@ -25,7 +25,11 @@ 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.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnumeric-configure.patch bgo#696934 dimstar@opensuse.org -- Fix LOCALEDATADIR detection +Patch0: gnumeric-configure.patch BuildRequires: fdupes +# Needed for patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libgda-devel BuildRequires: libgsf-devel @@ -35,10 +39,9 @@ BuildRequires: scrollkeeper BuildRequires: translation-update-upstream BuildRequires: update-desktop-files 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.10.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.0.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.2.0 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.1 BuildRequires: pkgconfig(libgsf-1) >= 1.14.24 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 BuildRequires: pkgconfig(pango) >= 1.24.0 @@ -98,6 +101,7 @@ Gnumeric is part of the GNOME project. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream translation-update-upstream po-functions gnumeric-functions # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) @@ -110,6 +114,8 @@ for LNG in po/*.po ; do done %build +# Needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh export CFLAGS="%{optflags} -fno-strict-aliasing" %configure\ --disable-scrollkeeper\