Accepting request 481946 from GNOME:Apps

1

OBS-URL: https://build.opensuse.org/request/show/481946
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnumeric?expand=0&rev=105
This commit is contained in:
Yuchen Lin 2017-03-31 13:07:19 +00:00 committed by Git OBS Bridge
commit 0fa1bc2123
6 changed files with 27 additions and 70 deletions

View File

@ -1,34 +0,0 @@
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

View File

@ -1,24 +0,0 @@
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">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7eade408b6c20d2e8ad557d539e5e2f29705845a2eaa181b38934bb0cad49c0b
size 21427344

3
gnumeric-1.12.34.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725
size 20012076

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Mar 21 10:08:37 UTC 2017 - dimstar@opensuse.org
- Update to version 1.12.34:
+ Fix hyperlinks import from ODF (bgo#779635).
+ Fix xlsx export of chart series names (bgo#778618).
+ Always export a transparent fill style in charts (bgo#779160).
+ Doc fixes.
+ Fix xlsx import with missing header/footer (bgo#778292).
+ Minor xlsx import improvements with alias colors.
+ Test suite improvements.
+ Improve Excel handling of hyperlinks.
+ Hyperlinks improvements (bgo#706671).
+ Plug leaks.
+ Fix issues with sheet-local names.
+ ssdiff improvements with hyperlinks, input messages,
conditional formats, and validations.
+ Make exit code from ssdiff follow diff's.
+ Fix ssdiff with inter-sheet references.
+ Fix style border colour sharing.
- Drop gnumeric-1.12.33-destdir.patch and
gnumeric-1.12.33-docbook.patch: fixed upstream.
-------------------------------------------------------------------
Tue Jan 31 22:34:30 UTC 2017 - firebird209@gmail.com

View File

@ -17,17 +17,13 @@
Name: gnumeric
Version: 1.12.33
Version: 1.12.34
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
@ -106,10 +102,6 @@ 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