diff --git a/gnumeric-1.9.4.tar.bz2 b/gnumeric-1.9.4.tar.bz2
deleted file mode 100644
index 3a89972..0000000
--- a/gnumeric-1.9.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:357ee84631030ccbf998a1aad2f408452150790cd931bf47ad295bec4fe121fb
-size 15859683
diff --git a/gnumeric-1.9.5.tar.bz2 b/gnumeric-1.9.5.tar.bz2
new file mode 100644
index 0000000..de94387
--- /dev/null
+++ b/gnumeric-1.9.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cf7d1c412a6efa9cecc4f37a44af9831ce790e09411c5cae859221b5a791237
+size 15866023
diff --git a/gnumeric-doc.patch b/gnumeric-doc.patch
deleted file mode 100644
index 2303d9b..0000000
--- a/gnumeric-doc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- gnumeric-1.7.6/doc/C/bugs.xml
-+++ gnumeric-1.7.6/doc/C/bugs.xml
-@@ -63,10 +63,10 @@
- report. For more detailed
- instructions, the main page of GNOME's bugzilla can be found at
-
-- http://bugzilla.gnome.org/
-+ http://bugzilla.gnome.org/
- and instructions can be found at
-
-- http://bugzilla.gnome.org/bug-HOWTO.html
-+ http://bugzilla.gnome.org/bug-HOWTO.html
- .
-
-
---- gnumeric-1.7.6/doc/C/gnumeric.xml
-+++ gnumeric-1.7.6/doc/C/gnumeric.xml
-@@ -816,7 +816,15 @@
-
-
-
-- &function-ref;
-+
-+
-+
-+ Function Reference
-+
-+ This appendix provides a list of all the functions which are
-+ currently defined in Gnumeric.
-+
-+
- &appendix-keybindings;
-
-
---- gnumeric-1.7.6/doc/C/graphics-plots.xml
-+++ gnumeric-1.7.6/doc/C/graphics-plots.xml
-@@ -1017,7 +1017,10 @@
- icons in the Graph Guru which allow
- setting the plot sub-type and style.
-
-+
-
-+
-+ xxx
-
-
-
---- gnumeric-1.7.6/doc/C/morehelp.xml
-+++ gnumeric-1.7.6/doc/C/morehelp.xml
-@@ -175,9 +175,7 @@
- also help explain how to use Gnumeric
- and can be accessed through the OpenOffice.org web site at
--
- http://www.openoffice.org/
--
- .
-
-
-@@ -221,9 +219,7 @@
- posted. To access the archives, use a web browser to go to the
- mailing list web page at
--
- http://www.gnome.org/
--
- and then ...
-
-
-@@ -312,7 +308,7 @@
- the internet to your location. More information about GIMPnet can
- be found by looking at the GIMPnet web site (
-- http://www.gimp.net/ ).
-+ http://www.gimp.net/ ).
-
-
-
diff --git a/gnumeric.changes b/gnumeric.changes
index a265125..c0834b5 100644
--- a/gnumeric.changes
+++ b/gnumeric.changes
@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Mon Mar 23 14:52:50 CET 2009 - vuntz@novell.com
+
+- Update to version 1.9.5:
+ + Fix style critical on latex export [bgo#574125]
+ + Always print the whole printarea even if it has no content or
+ style. [bgo#554116] [bgo#572818]
+ + Fix translation of argument names for empty names.
+ + Don't switch sheets when widgets are adjusted. [bgo#574734]
+ + Fix printing of rotated text (negative angles or non-default
+ alignment). [bgo#574813]
+ + Remove crash potential for various dialogs with multiple views.
+ [bgo#364291]
+ + Fix some strings. [bgo#575360]
+ + Make gconf use independent from the with-gnome option.
+ [bgo#574813]
+ + Fixed null pointer crash inoo_plot_area(). [bgo#575403]
+ + Work around semantic changes in gtk-2.16.
+ + rename sr@Latn -> sr@latin
+ + Fix multihead issues with cell comments.
+ + Fix multihead issue with sheet reordering.
+ + Fix multihead issues with tooltips.
+ + Fix PFACTOR to handle huge factors.
+ + Fix problem with dialogs not showing up in fullscreen mode.
+ [bgo#574602]
+ + Fix desktop file to always specify that we take URIs.
+ + Fix sheet-ordering by dragging. [bgo#574763]
+ + Fix potential crash for cell comment dialog with multiple
+ views. [Part of #364291]
+ + Fix lotus importer crash. [bgo#575190]
+ + Improve entry of date for locales not using slashes.
+ [Part of bgo#33229]
+ + Make date edit use the date separator of the locale.
+ [Part of bgo#33229]
+ + Fix xls writing crash. [Part of #575318]
+ + Fix criticals in xls export for comments without author.
+ + Fix crash while loading broken xls. [bgo#575393]
+ + Fix string problem with broken xls. [bgo#575452]
+ + Improve date entry for locales that end abbreviated month names
+ with punctuation.
+ + Fix ODS crashes. [bgo#575600] [bgo#575843] [bgo#575981]
+ + Use goffice magic formats for certain date and time formats so
+ we can persist them in .gnumeric.
+ + Fix setting of radio button objects' text.
+ + Implement OOO probing. [bgo#574381]
+- Stop using --with-gnome: it's now possible to use gconf without
+ this. Also remove libgnomeui-devel BuildRequires.
+- Add gconf2-devel BuildRequires.
+- Remove sr@latin hack: fixed upstream.
+- Drop gnumeric-doc.patch: not needed anymore.
+- Add back -fno-strict-aliasing to CFLAGS. There's a warning about
+ it.
+
-------------------------------------------------------------------
Tue Mar 10 20:58:42 CET 2009 - vuntz@novell.com
diff --git a/gnumeric.spec b/gnumeric.spec
index 5b44fa8..3cda68c 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gnumeric (Version 1.9.4)
+# spec file for package gnumeric (Version 1.9.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,11 +20,11 @@
Name: gnumeric
BuildRequires: fdupes
+BuildRequires: gconf2-devel
BuildRequires: goffice-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libgnomedb3-devel
-BuildRequires: libgnomeui-devel
BuildRequires: psiconv-devel
BuildRequires: python-devel
BuildRequires: python-gobject2-devel
@@ -36,11 +36,10 @@ Group: Productivity/Office/Spreadsheets
Provides: gnumeric2
Obsoletes: gnumeric2
Summary: Spreadsheet Application
-Version: 1.9.4
+Version: 1.9.5
Release: 1
Source: ftp://ftp.gnome.org/pub/gnome/sources/gnumeric/1.8/gnumeric-%{version}.tar.bz2
Url: http://www.gnumeric.org/
-Patch4: gnumeric-doc.patch
Requires: %{name}-lang = %{version}
Recommends: liberation-fonts ghostscript-fonts-std
# For perl-func plugin
@@ -172,17 +171,14 @@ Authors:
%lang_package
%prep
%setup -q
-%patch4 -p1
-# FIXME: Following files are apparently compiled without RPM_OPT_FLAGS:
-# boot.c,perl-loader.c,perl-gnumeric.c,xsinit.c,boot.c,perl-gnumeric.c,xsinit.c,perl-loader.c
%build
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--disable-scrollkeeper\
--disable-static\
--libexecdir=%{_prefix}/lib/gnumeric\
- --enable-ssindex\
- --with-gnome
+ --enable-ssindex
# --enable-pdfdocs
make %{?jobs:-j%jobs}
@@ -194,8 +190,6 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
# gnumeric.keys contains strange MIME types. Ignore them.
DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime || true
%suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK
-# Change sr@Latn to sr@latin
-mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin
%find_lang %{name}
%find_lang gnumeric-functions %{name}.lang
%find_gconf_schemas
@@ -248,6 +242,10 @@ fi
%{_mandir}/man?/*.*
%files lang -f %{name}.lang
+# Temporary workaround to not depend on libgnome: own the directories
+%defattr (-, root, root)
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
%files devel
%defattr(-, root, root)
@@ -256,6 +254,56 @@ fi
%{_libdir}/gnumeric/*/include
%changelog
+* Mon Mar 23 2009 vuntz@novell.com
+- Update to version 1.9.5:
+ + Fix style critical on latex export [bgo#574125]
+ + Always print the whole printarea even if it has no content or
+ style. [bgo#554116] [bgo#572818]
+ + Fix translation of argument names for empty names.
+ + Don't switch sheets when widgets are adjusted. [bgo#574734]
+ + Fix printing of rotated text (negative angles or non-default
+ alignment). [bgo#574813]
+ + Remove crash potential for various dialogs with multiple views.
+ [bgo#364291]
+ + Fix some strings. [bgo#575360]
+ + Make gconf use independent from the with-gnome option.
+ [bgo#574813]
+ + Fixed null pointer crash inoo_plot_area(). [bgo#575403]
+ + Work around semantic changes in gtk-2.16.
+ + rename sr@Latn -> sr@latin
+ + Fix multihead issues with cell comments.
+ + Fix multihead issue with sheet reordering.
+ + Fix multihead issues with tooltips.
+ + Fix PFACTOR to handle huge factors.
+ + Fix problem with dialogs not showing up in fullscreen mode.
+ [bgo#574602]
+ + Fix desktop file to always specify that we take URIs.
+ + Fix sheet-ordering by dragging. [bgo#574763]
+ + Fix potential crash for cell comment dialog with multiple
+ views. [Part of #364291]
+ + Fix lotus importer crash. [bgo#575190]
+ + Improve entry of date for locales not using slashes.
+ [Part of bgo#33229]
+ + Make date edit use the date separator of the locale.
+ [Part of bgo#33229]
+ + Fix xls writing crash. [Part of #575318]
+ + Fix criticals in xls export for comments without author.
+ + Fix crash while loading broken xls. [bgo#575393]
+ + Fix string problem with broken xls. [bgo#575452]
+ + Improve date entry for locales that end abbreviated month names
+ with punctuation.
+ + Fix ODS crashes. [bgo#575600] [bgo#575843] [bgo#575981]
+ + Use goffice magic formats for certain date and time formats so
+ we can persist them in .gnumeric.
+ + Fix setting of radio button objects' text.
+ + Implement OOO probing. [bgo#574381]
+- Stop using --with-gnome: it's now possible to use gconf without
+ this. Also remove libgnomeui-devel BuildRequires.
+- Add gconf2-devel BuildRequires.
+- Remove sr@latin hack: fixed upstream.
+- Drop gnumeric-doc.patch: not needed anymore.
+- Add back -fno-strict-aliasing to CFLAGS. There's a warning about
+ it.
* Tue Mar 10 2009 vuntz@novell.com
- Use --with-gnome because we really want gnumeric to use gconf.
- Add libgnomeui-devel BuildRequires.