Accepting request 766333 from home:MSirringhaus:branches:devel:languages:python

- Update to 4.4.2: * LP#1835708: ElementInclude incorrectly rejected repeated non-recursive includes as recursive. * Remove patch lxml-libxml-2.9.10.patch which is now upstream OBS-URL: https://build.opensuse.org/request/show/766333 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=133
2020-01-22 14:50:22 +00:00 · 2020-01-22 14:50:22 +00:00 · 4292c65844
commit 4292c65844
parent 42248a018d
7 changed files with 16 additions and 59 deletions
--- a/lxml-4.4.1.tar.gz
+++ b/lxml-4.4.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692
-size 4532114
--- a/lxml-4.4.2.tar.gz
+++ b/lxml-4.4.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06
+size 2574193
--- a/lxml-libxml-2.9.10.patch
+++ b/lxml-libxml-2.9.10.patch
@ -1,48 +0,0 @@
-From a2551ed1cb862b2113dc13ca6d057208fe02c31e Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Fri, 1 Nov 2019 08:47:16 +0100
-Subject: [PATCH] Adapt doctest to libxml2 2.9.10.
-
---
- doc/api.txt | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/doc/api.txt b/doc/api.txt
-index 9e86d182d..ed8db6ddb 100644
--- a/doc/api.txt
-+++ b/doc/api.txt
-@@ -323,9 +323,8 @@ error level:
- .. sourcecode:: pycon
- 
-   >>> log = e.error_log.filter_from_level(etree.ErrorLevels.FATAL)
-  >>> print(log)
-+  >>> print(log[0])
-   <string>:4:8:FATAL:PARSER:ERR_TAG_NAME_MISMATCH: Opening and ending tag mismatch: a line 3 and root
-  <string>:5:1:FATAL:PARSER:ERR_TAG_NOT_FINISHED: Premature end of data in tag root line 2
- 
- This might look a little cryptic at first, but it is the information that
- libxml2 gives you.  At least the message at the end should give you a hint
-@@ -345,18 +344,10 @@ like this:
-   >>> print(entry.filename)
-   <string>
- 
-There is also a convenience attribute ``last_error`` that returns the last
-error or fatal error that occurred:
-
-.. sourcecode:: pycon
-
-  >>> entry = e.error_log.last_error
-  >>> print(entry.domain_name)
-  PARSER
-  >>> print(entry.type_name)
-  ERR_TAG_NOT_FINISHED
-  >>> print(entry.filename)
-  <string>
-+There is also a convenience attribute ``error_log.last_error`` that returns the
-+last error or fatal error that occurred, so that it's easy to test if there was
-+an error at all. Note, however, that there might have been more than one error,
-+and the first error that occurred might be more relevant in some cases.
- 
- 
- Error logging
-
--- a/lxmldoc-4.4.1.pdf
+++ b/lxmldoc-4.4.1.pdf
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d310ea85b0aaae5de890c2e7eb8e38d5bcce3b068590cf163530e6a013bc9dd6
-size 1164438
--- a/lxmldoc-4.4.2.pdf
+++ b/lxmldoc-4.4.2.pdf
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b52174f9677f27270fa2bfa5175c64eaf09506577d5ed74f8cc4568edaace224
+size 1166108
--- a/python-lxml.changes
+++ b/python-lxml.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 22 13:55:03 UTC 2020 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Update to 4.4.2:
+  * LP#1835708: ElementInclude incorrectly rejected repeated 
+    non-recursive includes as recursive.
+  * Remove patch lxml-libxml-2.9.10.patch which is now upstream
+
 -------------------------------------------------------------------
 Sun Nov 17 14:25:04 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/python-lxml.spec
+++ b/python-lxml.spec
@ -1,7 +1,7 @@
 #
 # spec file for package python-lxml
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@

 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-lxml
-Version:        4.4.1
+Version:        4.4.2
 Release:        0
 Summary:        Pythonic XML processing library
 License:        BSD-3-Clause AND GPL-2.0-or-later
@ -26,8 +26,6 @@ Group:          Development/Languages/Python
 URL:            https://lxml.de/
 Source0:        https://files.pythonhosted.org/packages/source/l/lxml/lxml-%{version}.tar.gz
 Source1:        https://lxml.de/lxmldoc-%{version}.pdf
-# PATCH-FIX-UPSTREAM lxml-libxml-2.9.10.patch dimstar@opensuse.org -- Fix build against libxml 2.9.10
-Patch0:         lxml-libxml-2.9.10.patch
 BuildRequires:  %{python_module Cython >= 0.29.7}
 BuildRequires:  %{python_module cssselect >= 0.9.1}
 BuildRequires:  %{python_module setuptools >= 18.0.1}
@ -73,7 +71,6 @@ This package contains header files needed to use lxml's C API.

 %prep
 %setup -q -n lxml-%{version}
-%patch0 -p1
 cp %{SOURCE1} .

 # remove generated files