diff --git a/abuild.patch b/abuild.patch new file mode 100644 index 0000000..50c854e --- /dev/null +++ b/abuild.patch @@ -0,0 +1,13 @@ +Index: gnumeric-1.7.9/plugins/applix/applix-read.c +=================================================================== +--- gnumeric-1.7.9.orig/plugins/applix/applix-read.c ++++ gnumeric-1.7.9/plugins/applix/applix-read.c +@@ -57,6 +57,8 @@ + #include + #include + #include ++#include ++ + #include + #include + diff --git a/build-fixes.patch b/build-fixes.patch new file mode 100644 index 0000000..d3eb29b --- /dev/null +++ b/build-fixes.patch @@ -0,0 +1,32 @@ +Index: gnumeric-1.7.9/src/widgets/gnumeric-expr-entry.c +=================================================================== +--- gnumeric-1.7.9.orig/src/widgets/gnumeric-expr-entry.c ++++ gnumeric-1.7.9/src/widgets/gnumeric-expr-entry.c +@@ -176,14 +176,14 @@ cb_icon_clicked (GtkButton *icon, + g_assert (GTK_IS_CONTAINER (old_entry_parent)); + + g_object_set_data_full (G_OBJECT (entry), "old_entry_parent", +- gtk_widget_ref (old_entry_parent), +- (GDestroyNotify) gtk_widget_unref); ++ g_object_ref ((gpointer) old_entry_parent), ++ (GDestroyNotify) g_object_unref); + + g_return_if_fail ((GtkWidget *) entry != old_toplevel_child); + + g_object_set_data_full (G_OBJECT (entry), "old_toplevel_child", +- gtk_widget_ref (old_toplevel_child), +- (GDestroyNotify) gtk_widget_unref); ++ g_object_ref ((gpointer) old_toplevel_child), ++ (GDestroyNotify) g_object_unref); + + gtk_window_get_size (GTK_WINDOW (toplevel), &width, &height); + g_object_set_data (G_OBJECT (entry), "old_window_width", GUINT_TO_POINTER (width)); +@@ -238,7 +238,7 @@ cb_icon_clicked (GtkButton *icon, + gtk_container_remove (GTK_CONTAINER (toplevel), GTK_WIDGET (entry)); + gtk_container_add (GTK_CONTAINER (toplevel), old_toplevel_child); + gtk_container_add (GTK_CONTAINER (old_entry_parent), GTK_WIDGET (entry)); +- gtk_widget_unref (GTK_WIDGET (entry)); ++ g_object_unref ((gpointer) GTK_WIDGET (entry)); + + container_props = g_object_get_data (G_OBJECT (entry), "container_props"); + container_props_pspec = g_object_get_data (G_OBJECT (entry), "container_props_pspec"); diff --git a/gnumeric-1.7.8.tar.bz2 b/gnumeric-1.7.8.tar.bz2 deleted file mode 100644 index 99219b7..0000000 --- a/gnumeric-1.7.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:693a2603ad00b890f5f4f097fdb069983bf548f27a0f84b88d987db79e461e48 -size 13169343 diff --git a/gnumeric-1.7.9.tar.bz2 b/gnumeric-1.7.9.tar.bz2 new file mode 100644 index 0000000..907e78a --- /dev/null +++ b/gnumeric-1.7.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6f7043b0e0039478858d19ed8aea6593140319a3e101da0f0003cee688f4797 +size 13337850 diff --git a/gnumeric.changes b/gnumeric.changes index db2323a..9b6a779 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 10 18:24:01 CEST 2007 - maw@suse.de + +- Update to version 1.7.9, which: +- Switches from gtk print to gnome print +- Imports and exports inline arrays in ODF +- Exports cell comments to xls +- Fixes the following bugs against bugzilla.gnome.org: #415007, + #414815, #308562, #417632, #115112, #67453], #418868, #423603, + #421678, #427019, and #152584. + ------------------------------------------------------------------- Thu Jun 7 13:31:52 CEST 2007 - sbrabec@suse.cz diff --git a/gnumeric.spec b/gnumeric.spec index d0165b9..62b7969 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -1,5 +1,5 @@ # -# spec file for package gnumeric (Version 1.7.8) +# spec file for package gnumeric (Version 1.7.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,19 +12,21 @@ Name: gnumeric BuildRequires: docbook-utils gnutls-devel goffice-devel indent intltool libgnomedb-devel libgnomeprintui-devel libidl libtiff-devel libwnck-devel mDNSResponder-devel pcre-devel perl-XML-Parser psiconv-devel python-devel python-gtk-devel scrollkeeper shared-mime-info update-desktop-files -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Office/Spreadsheets Provides: gnumeric2 Obsoletes: gnumeric2 Summary: Spreadsheet Application -Version: 1.7.8 -Release: 31 +Version: 1.7.9 +Release: 1 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnumeric/1.6/gnumeric-%{version}.tar.bz2 URL: http://www.gnumeric.org/ Patch: gnumeric-pro-fonts.patch Patch1: %{name}-desktop.patch Patch4: gnumeric-doc.patch Patch5: gnumeric-autobuild-error.patch +Patch6: build-fixes.patch +Patch7: abuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on @@ -156,6 +158,8 @@ Authors: %patch1 %patch4 -p1 %patch5 +%patch6 -p1 +%patch7 -p1 rm po/no.* sed -i "/en_GB/s/ no / /" configure.in # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: @@ -240,6 +244,14 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 10 2007 - maw@suse.de +- Update to version 1.7.9, which: +- Switches from gtk print to gnome print +- Imports and exports inline arrays in ODF +- Exports cell comments to xls +- Fixes the following bugs against bugzilla.gnome.org: #415007, + [#414815], #308562, #417632, #115112, #67453], #418868, #423603, + [#421678], #427019, and #152584. * Thu Jun 07 2007 - sbrabec@suse.cz - Fixed deskop file translation. - Fixed devel dependencies.