From 0c1b97036cbd55ef2442a196e5649126fb956c3f5d9671feb13d4afb6373ea9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 22 Feb 2019 10:43:54 +0000
Subject: [PATCH] Accepting request 678108 from home:jayvdb:pyexcel

- Update to v1.4.0, using defusedxml
- Replace dead url with https://github.com/eea/odfpy
- Make sure to install license files

OBS-URL: https://build.opensuse.org/request/show/678108
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-odfpy?expand=0&rev=22
---
 odfpy-1.3.6.tar.gz   |  3 ---
 odfpy-1.4.0.tar.gz   |  3 +++
 python-odfpy.changes | 16 +++++++++++++++-
 python-odfpy.spec    | 12 +++++++-----
 4 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 odfpy-1.3.6.tar.gz
 create mode 100644 odfpy-1.4.0.tar.gz

diff --git a/odfpy-1.3.6.tar.gz b/odfpy-1.3.6.tar.gz
deleted file mode 100644
index 1df4435..0000000
--- a/odfpy-1.3.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b
-size 691122
diff --git a/odfpy-1.4.0.tar.gz b/odfpy-1.4.0.tar.gz
new file mode 100644
index 0000000..e2d8c3c
--- /dev/null
+++ b/odfpy-1.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b
+size 715096
diff --git a/python-odfpy.changes b/python-odfpy.changes
index f27c126..dc3c41d 100644
--- a/python-odfpy.changes
+++ b/python-odfpy.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Feb 22 01:45:28 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Update to v1.4.0
+  * Use defusedxml, which guards against various XML vulnerabilities
+  * Fix odf/opendocument.py toXml needs codecs import
+  * Add tests for various XML vulnerabilities
+  * Add metadata for Python 3.7 support
+- Replace dead url with https://github.com/eea/odfpy
+
 -------------------------------------------------------------------
 Wed Aug 29 10:52:40 UTC 2018 - tchvatal@suse.com
 
@@ -9,7 +19,11 @@ Wed Jun  6 13:52:20 UTC 2018 - mcepl@suse.com
 - Clean SPEC file
 - Switched on tests
 - Update to 1.3.6
-    - Various bugfixes
+  * Proper import of load
+  * Escaping: replace xml-1.0-illegal characters with question marks
+  * ODT merge example
+  * Changed the path to save images.
+    Now image of the subobject is stored in a folder of subobject
 
 -------------------------------------------------------------------
 Thu Aug 24 05:19:14 UTC 2017 - tbechtold@suse.com
diff --git a/python-odfpy.spec b/python-odfpy.spec
index e1150c6..76805de 100644
--- a/python-odfpy.spec
+++ b/python-odfpy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-odfpy
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,18 +20,20 @@
 %define modname odfpy
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-%{modname}
-Version:        1.3.6
+Version:        1.4.0
 Release:        0
 Summary:        Python API and tools to manipulate OpenDocument files
 License:        GPL-2.0-or-later AND Apache-2.0
 Group:          Development/Languages/Python
-URL:            http://opendocumentfellowship.com/development/projects/odfpy
+URL:            https://github.com/eea/odfpy
 Source:         https://files.pythonhosted.org/packages/source/o/odfpy/%{modname}-%{version}.tar.gz
+BuildRequires:  %{python_module defusedxml}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
+Requires:       python-defusedxml
 %python_subpackages
 
 %description
@@ -59,7 +61,7 @@ In addition to the API, there are a few scripts:
 - odfuserfield - List or change the user-field declarations in an ODF file
 - xml2odf - Create OD? package from OpenDocument in XML form
 
-Visit http://odfpy.forge.osor.eu/ for documentation and examples.
+Visit https://github.com/eea/odfpy for documentation and examples.
 
 %prep
 %setup -q -n %{modname}-%{version}