From 428efa95846b32648dd089512177d1edf5b13194 Mon Sep 17 00:00:00 2001
From: Julian Sikorski <belegdol@fedoraproject.org>
Date: Mar 27 2017 14:56:01 +0000
Subject: Updated to 1.12.34

Dropped upstreamed patches

---

diff --git a/.gitignore b/.gitignore
index 46fb8fa..91eae31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ gnumeric-1.10.8.tar.bz2
 /gnumeric-1.12.31.tar.xz
 /gnumeric-1.12.32.tar.xz
 /gnumeric-1.12.33.tar.xz
+/gnumeric-1.12.34.tar.xz
diff --git a/gnumeric-1.12.33-destdir.patch b/gnumeric-1.12.33-destdir.patch
deleted file mode 100644
index 278cab0..0000000
--- a/gnumeric-1.12.33-destdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up gnumeric-1.12.33/doc/Makefile.am.destdir gnumeric-1.12.33/doc/Makefile.am
---- gnumeric-1.12.33/doc/Makefile.am.destdir	2017-01-30 21:47:16.000000000 +0100
-+++ gnumeric-1.12.33/doc/Makefile.am	2017-01-31 08:19:26.170304443 +0100
-@@ -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
- 
-diff -up gnumeric-1.12.33/doc/Makefile.in.destdir gnumeric-1.12.33/doc/Makefile.in
---- gnumeric-1.12.33/doc/Makefile.in.destdir	2017-01-30 21:48:07.000000000 +0100
-+++ gnumeric-1.12.33/doc/Makefile.in	2017-01-31 08:19:42.562456025 +0100
-@@ -1347,7 +1347,7 @@ uninstall-am: uninstall-manpageDATA unin
- 
- 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; \
-@@ -1355,7 +1355,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
- 
diff --git a/gnumeric-1.12.33-docbook.patch b/gnumeric-1.12.33-docbook.patch
deleted file mode 100644
index 8e56bea..0000000
--- a/gnumeric-1.12.33-docbook.patch
+++ /dev/null
@@ -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">
diff --git a/gnumeric.spec b/gnumeric.spec
index c97641d..9bf5c93 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.12.33
-Release:          2%{?dist}
+Version:          1.12.34
+Release:          1%{?dist}
 Summary:          Spreadsheet program for GNOME
 #LGPLv2+:
 #plugins/gda/plugin-gda.c
@@ -13,8 +13,6 @@ Summary:          Spreadsheet program for GNOME
 License:          GPLv2+ and GPLv3+ and LGPLv2+
 URL:              http://projects.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.12/%{name}-%{version}.tar.xz
-Patch0:           %{name}-%{version}-destdir.patch
-Patch1:           %{name}-%{version}-docbook.patch
 BuildRequires:    bison
 BuildRequires:    desktop-file-utils
 BuildRequires:    docbook-dtds
@@ -65,7 +63,7 @@ This package contains the following additional plugins for gnumeric:
 
 
 %prep
-%autosetup -p1
+%autosetup
 chmod -x plugins/excel/rc4.?
 
 
@@ -175,6 +173,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Mon Mar 27 2017 Julian Sikorski <belegdol@fedoraproject.org> - 1:1.12.34-1
+- Updated to 1.12.34
+- Dropped upstreamed patches
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 7221d5e..c03c844 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnumeric-1.12.33.tar.xz) = 75a91cab88fdf7788e5ae3a7ab8e6fc9dd0f362bd2410841870c9e93e40ed84bd99a4f143b19af73300a6ac42f2f37c3331038e842b38bed2fa2aa38205f071b
+SHA512 (gnumeric-1.12.34.tar.xz) = 59f2b6eb9b43414a4673657b230aeb9beb9dea5e2eec8457719e8d1fbfab0056807cf1946dfb8b9c0dc9ec3194543ac0b7b3d51069099ab9fd8b80121172821d