diff --git a/gnumeric-1.12.1.tar.xz b/gnumeric-1.12.1.tar.xz deleted file mode 100644 index 526a8c0..0000000 --- a/gnumeric-1.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901 -size 15692328 diff --git a/gnumeric-1.12.2.tar.xz b/gnumeric-1.12.2.tar.xz new file mode 100644 index 0000000..a14b78f --- /dev/null +++ b/gnumeric-1.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874 +size 15517296 diff --git a/gnumeric-configure.patch b/gnumeric-configure.patch deleted file mode 100644 index ba764a5..0000000 --- a/gnumeric-configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 d2dd171..58b0809 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri May 3 08:05:38 UTC 2013 - dimstar@opensuse.org + +- Update to version 1.12.2: + + Improve import of header/footer info from ODF. + + Fix plot placement in ODF import. + + Support ODF's title tag in headers and footers. + + Fix locale directory. + + Update documentation. + + Bugs fixed: bgo#698389, bgo#698388, bgo#698535, bgo#635217, + bgo#347013, bgo#696533, bgo#697107, bgo#697281, bgo#695529, + bgo#695031, bgo#696826, bgo#659317, bgo#697293, bgo#697634, + bgo#683494, bgo#697927, bgo#697850, bgo#608780, bgo#577768, + bgo#654211, bgo#661800, bgo#686156, bgo#685446, bgo#695839, + bgo#590889, bgo#689283, bgo#698424, bgo#625687, bgo#698680, + bgo#698772. +- Drop gnumeric-configure.patch: fixed upstream. +- Drop gnome-common BuildRequires and call to gnome-autogen.sh, as + we no longer carry any patches. + ------------------------------------------------------------------- Tue Mar 19 23:13:12 UTC 2013 - dimstar@opensuse.org diff --git a/gnumeric.spec b/gnumeric.spec index 88cda6d..1bbf699 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.12.1 +Version: 1.12.2 Release: 0 # FIXME: Enable gobject-introspection when build succeeds (bgo#684159) Summary: Spreadsheet Application @@ -25,11 +25,7 @@ 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 @@ -41,7 +37,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) >= 2.28.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(libgoffice-0.10) >= 0.10.2 BuildRequires: pkgconfig(libgsf-1) >= 1.14.24 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 BuildRequires: pkgconfig(pango) >= 1.24.0 @@ -101,7 +97,6 @@ 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) @@ -114,8 +109,6 @@ 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\ @@ -130,8 +123,8 @@ make %{?_smp_mflags} # gnumeric-1.6.3: --disable-scrollkeeper does not work properly. rm -r %{buildroot}%{_localstatedir}/scrollkeeper %suse_update_desktop_file -r %{name} Office Spreadsheet GNOME GTK -%find_lang %{name} %{?no_lang_C} -%find_lang gnumeric-functions %{?no_lang_C} %{name}.lang +%find_lang %{name}-%{version} %{?no_lang_C} %{name}.lang +%find_lang gnumeric-%{version}-functions %{?no_lang_C} %{name}.lang find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}