From 7a27bab5dce0c30e6b13777d3a00bb98432ff8d33f2844475f1c919612c33e16 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 11 May 2022 15:14:14 +0000
Subject: [PATCH] - Update to 1.3.12:   - Added support for registering custom
 xmlsec IO callbacks   - Added support for building without MD5 transforms   -
 Added support for PEP 539 for Python 3.7 and newer   - Using lxml-stubs
 package instead of custom LXML stubs

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=14
---
 avoid_lxml_tests_failing.patch | 23 +++++++++++++++++++++++
 python-xmlsec.changes          |  9 +++++++++
 python-xmlsec.spec             | 24 ++++++++++++++++--------
 xmlsec-1.3.11.tar.gz           |  3 ---
 xmlsec-1.3.12.tar.gz           |  3 +++
 5 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 avoid_lxml_tests_failing.patch
 delete mode 100644 xmlsec-1.3.11.tar.gz
 create mode 100644 xmlsec-1.3.12.tar.gz

diff --git a/avoid_lxml_tests_failing.patch b/avoid_lxml_tests_failing.patch
new file mode 100644
index 0000000..f9223c0
--- /dev/null
+++ b/avoid_lxml_tests_failing.patch
@@ -0,0 +1,23 @@
+---
+ tests/base.py              |    1 +
+ tests/test_doc_examples.py |    2 ++
+ 2 files changed, 3 insertions(+)
+
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -99,6 +99,7 @@ class TestMemoryLeaks(unittest.TestCase)
+ 
+     def load_xml(self, name, xpath=None):
+         """returns xml.etree"""
++        etree.set_default_parser(parser=etree.XMLParser())
+         root = etree.parse(self.path(name)).getroot()
+         if xpath is None:
+             return root
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+     """
+     with cd(example.parent):
+         runpy.run_path(str(example))
++    from lxml import etree
++    etree.set_default_parser(parser=etree.XMLParser())
diff --git a/python-xmlsec.changes b/python-xmlsec.changes
index 4d0f954..904a2d6 100644
--- a/python-xmlsec.changes
+++ b/python-xmlsec.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 11 12:39:21 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Update to 1.3.12:
+  - Added support for registering custom xmlsec IO callbacks
+  - Added support for building without MD5 transforms
+  - Added support for PEP 539 for Python 3.7 and newer
+  - Using lxml-stubs package instead of custom LXML stubs
+
 -------------------------------------------------------------------
 Thu Jun 10 09:15:51 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-xmlsec.spec b/python-xmlsec.spec
index a5e6070..cae257e 100644
--- a/python-xmlsec.spec
+++ b/python-xmlsec.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-xmlsec
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,29 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# gh#mehcode/python-xmlsec#204
+%define skip_python310 1
 Name:           python-xmlsec
-Version:        1.3.11
+Version:        1.3.12
 Release:        0
 Summary:        Python bindings for the XML Security Library
 License:        MIT
 URL:            https://github.com/mehcode/python-xmlsec
 Source:         https://files.pythonhosted.org/packages/source/x/xmlsec/xmlsec-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM avoid_lxml_tests_failing.patch gh#mehcode/python-xmlsec#84 mcepl@suse.com
+# work around the lxml issue
+Patch0:         avoid_lxml_tests_failing.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module hypothesis}
 BuildRequires:  %{python_module lxml >= 3.0}
 BuildRequires:  %{python_module lxml-devel}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pkgconfig}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module toml}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -50,23 +57,24 @@ Requires:       python-pkgconfig
 Python bindings for the XML Security Library
 
 %prep
-%setup -q -n xmlsec-%{version}
+%autosetup -p1 -n xmlsec-%{version}
 
 %build
 export CFLAGS="%{optflags}"
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
-# Tests coredump gh#mehcode/python-xmlsec#183
-# %%pytest_arch tests/
+%pytest_arch tests/
 
 %files %{python_files}
 %doc README.rst
 %license LICENSE
-%{python_sitearch}/*
+%{python_sitearch}/xmlsec
+%{python_sitearch}/xmlsec-%{version}*-info
+%{python_sitearch}/xmlsec*.so
 
 %changelog
diff --git a/xmlsec-1.3.11.tar.gz b/xmlsec-1.3.11.tar.gz
deleted file mode 100644
index 7e85dff..0000000
--- a/xmlsec-1.3.11.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd2eaaff7f31784a07dd99ce81fa767313df3ba1834faa4143ee2c07000cac7a
-size 61272
diff --git a/xmlsec-1.3.12.tar.gz b/xmlsec-1.3.12.tar.gz
new file mode 100644
index 0000000..8a2c961
--- /dev/null
+++ b/xmlsec-1.3.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9
+size 64199