Accepting request 455357 from GNOME:Next

I forgot to sub this version bump from firebird OBS-URL: https://build.opensuse.org/request/show/455357 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=139
2017-02-08 21:22:19 +00:00 · 2017-02-08 21:22:19 +00:00 · d0721fce00
commit d0721fce00
parent efeafcb6b6
6 changed files with 102 additions and 14 deletions
--- a/gnumeric-1.12.32.tar.xz
+++ b/gnumeric-1.12.32.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8
-size 18748772
--- a/gnumeric-1.12.33-destdir.patch
+++ b/gnumeric-1.12.33-destdir.patch
@ -0,0 +1,34 @@
+From 798755af32c42e395d167d9d49d14cbe449d2842 Mon Sep 17 00:00:00 2001
+From: Morten Welinder <terra@gnome.org>
+Date: Tue, 31 Jan 2017 18:26:55 -0500
+Subject: Compilation: destdir fix from Redhat.
+
+---
+ doc/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 7e3f9a4..52a011d 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -527,7 +527,7 @@ HELP_MEDIA= \
+ 
+ install-exec-hook:
+ 	for d in C $(HELP_LINGUAS); do \
+-		helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \
+		helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \
+ 		install -d $$helpdir; \
+ 		$(RM) $$helpdir/index.docbook; \
+ 		$(LN_S) gnumeric.xml $$helpdir/index.docbook; \
+@@ -535,7 +535,7 @@ install-exec-hook:
+ 
+ uninstall-hook:
+ 	for d in C $(HELP_LINGUAS); do \
+-		helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \
+		helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \
+ 		$(RM) $$helpdir/index.docbook; \
+ 	done
+ 
+-- 
+cgit v0.12
+
--- a/gnumeric-1.12.33-docbook.patch
+++ b/gnumeric-1.12.33-docbook.patch
@ -0,0 +1,24 @@
+diff -up gnumeric-1.12.33/doc/C/gnumeric.xml.docbook gnumeric-1.12.33/doc/C/gnumeric.xml
+--- gnumeric-1.12.33/doc/C/gnumeric.xml.docbook	2017-02-01 03:58:38.893646538 +0100
+++ gnumeric-1.12.33/doc/C/gnumeric.xml	2017-02-01 04:05:40.111116668 +0100
+@@ -47,17 +47,17 @@
+ 
+   <!-- For mdash, hellip and friends -->
+   <!ENTITY % isopub PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-           "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-pub.ent">
+           "http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent">
+   %isopub;
+ 
+   <!-- For nbsp, pound, yen and friends -->
+   <!ENTITY % isonum PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-           "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-num.ent">
+           "http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent">
+   %isonum;
+ 
+   <!-- Character entity to provide greek letters in simulation chapter -->
+   <!ENTITY % isogrk1 PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-           "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-grk1.ent">
+           "http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent">
+   %isogrk1;
+ 
+   <!ENTITY legal                SYSTEM "legal.xml">
--- a/gnumeric-1.12.33.tar.xz
+++ b/gnumeric-1.12.33.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7eade408b6c20d2e8ad557d539e5e2f29705845a2eaa181b38934bb0cad49c0b
+size 21427344
--- a/gnumeric.changes
+++ b/gnumeric.changes
@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Jan 31 22:34:30 UTC 2017 - firebird209@gmail.com
+
+- Update to version 1.12.33:
+  + Fix export/import of scaling information to/from ODF.
+  + Fix Wilcoxon Signed Rank Test handling of ties (bgo#772718).
+  + Fix xlsx export of scale to page information (bgo#776196).
+  + Fix use of cell formats in graphs data labels (bgo#777338).
+  + Speed up sstest part of test suite.
+  + Bring documentation build into the 21 century.
+  + Non-linear solver improvements.
+  + Avoid atomizing style regions with conditional formats.
+  + Adapt to glpk file format changes.
+  + Fix stf problems with text format (bgo#777543).
+- Updated Recommends: liberation-fonts to liberation2-fonts.
+- Add gnumeric-1.12.33-destdir.patch: Fix compilation, destdir of
+  helpfiles.
+- Add docbook-dtds and itstool BuildRequires: New dependency after
+  above patch.
+- Following the above, drop rarian-scrollkeeper-compat
+  BuildRequires: No longer needed.
+- Add gnumeric-1.12.33-docbook.patch: Fixes some problems with
+  non-ascii parameter names.
+
 -------------------------------------------------------------------
 Sat Aug 20 21:21:03 UTC 2016 - zaitor@opensuse.org

--- a/gnumeric.spec
+++ b/gnumeric.spec
@ -1,7 +1,7 @@
 #
 # spec file for package gnumeric
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,19 +17,25 @@


 Name:           gnumeric
-Version:        1.12.32
+Version:        1.12.33
 Release:        0
 Summary:        Spreadsheet Application
 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-1.12.33-destdir.patch firebird209@gmail.com -- Fix compilation, destdir of helpfiles.
+Patch0:         gnumeric-1.12.33-destdir.patch
+# PATCH-FIX-UPSTREAM gnumeric-1.12.33-docbook.patch firebird209@gmail.com -- Fixes some problems with non-ascii parameter names.
+Patch1:         gnumeric-1.12.33-docbook.patch
 BuildRequires:  bison
+BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
 BuildRequires:  intltool
+BuildRequires:  itstool
 BuildRequires:  libgsf-devel
+BuildRequires:  libtool
 BuildRequires:  python-devel
-BuildRequires:  rarian-scrollkeeper-compat
 %if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
 %endif
@ -47,7 +53,7 @@ BuildRequires:  pkgconfig(pangocairo) >= 1.24.0
 BuildRequires:  pkgconfig(pygobject-3.0) >= 3.0.0
 Recommends:     %{name}-lang
 Recommends:     ghostscript-fonts-std
-Recommends:     liberation-fonts
+Recommends:     liberation2-fonts
 # gnumeric uses a ghelp: URI to launch the help application. Let's recommend to have an app that can handle it (bnc#719679)
 Recommends:     mimehandler(x-scheme-handler/ghelp)
 Provides:       gnumeric2 = %{version}
@ -100,6 +106,10 @@ Gnumeric is part of the GNOME project.
 %lang_package
 %prep
 %setup -q
+# Destdir fix for Gnumeric 1.12.33
+%patch0 -p1
+# Use xml-dtd
+%patch1 -p1
 %if !0%{?is_opensuse}
 translation-update-upstream
 translation-update-upstream po-functions gnumeric-functions
@ -115,6 +125,7 @@ done

 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
+autoreconf -fiv
 %configure\
 	--disable-scrollkeeper\
 	--disable-static\
@ -126,6 +137,7 @@ make %{?_smp_mflags}
 %make_install
 # FIXME: Build as root modifies system!
 %suse_update_desktop_file -r %{name} Office Spreadsheet GNOME GTK
+%find_lang %{name} %{?no_lang_C}
 %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
@ -146,13 +158,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files
 %defattr(-, root, root)
 %doc AUTHORS BEVERAGES BUGS COPYING COPYING-gpl2 COPYING-gpl3 HACKING MAINTAINERS NEWS README ChangeLog OChangeLog*
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/%{name}/
-%doc %{_datadir}/omf/%{name}/%{name}-C.omf
+%doc %{_datadir}/help/C/%{name}
 %dir %{_datadir}/appdata/
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_bindir}/*