Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -2,3 +2,6 @@
 /defusedxml-0.4.1.tar.gz
 /defusedxml-0.5.0.tar.gz
 /defusedxml-0.6.0.tar.gz
+/defusedxml-0.7.0rc1.tar.gz
+/defusedxml-0.7.0rc2.tar.gz
+/defusedxml-0.7.1.tar.gz

drop-makeSuite.patch

@@ -0,0 +1,42 @@
+From 4e6cea5f5bb44bf06dd30a723cf13334693c3150 Mon Sep 17 00:00:00 2001
+From: Christian Heimes <christian@python.org>
+Date: Fri, 22 Sep 2023 14:01:50 +0200
+Subject: [PATCH] Improve tests (partial)
+
+- `makeSuite` is deprecated
+
+diff --git a/tests.py b/tests.py
+index ab52aab..c60335e 100644
+--- a/tests.py
++++ b/tests.py
+@@ -542,17 +559,19 @@ def test_defused_gzip_response(self):
+ 
+ def test_main():
+     suite = unittest.TestSuite()
+-    suite.addTests(unittest.makeSuite(TestDefusedcElementTree))
+-    suite.addTests(unittest.makeSuite(TestDefusedElementTree))
+-    suite.addTests(unittest.makeSuite(TestDefusedMinidom))
+-    suite.addTests(unittest.makeSuite(TestDefusedMinidomWithParser))
+-    suite.addTests(unittest.makeSuite(TestDefusedPulldom))
+-    suite.addTests(unittest.makeSuite(TestDefusedSax))
+-    suite.addTests(unittest.makeSuite(TestXmlRpc))
+-    if lxml is not None:
+-        suite.addTests(unittest.makeSuite(TestDefusedLxml))
+-    if gzip is not None:
+-        suite.addTests(unittest.makeSuite(TestDefusedGzip))
++    cls = [
++        TestDefusedElementTree,
++        TestDefusedcElementTree,
++        TestDefusedMinidom,
++        TestDefusedMinidomWithParser,
++        TestDefusedPulldom,
++        TestDefusedSax,
++        TestDefusedLxml,
++        TestXmlRpc,
++        TestDefusedGzip,
++    ]
++    for c in cls:
++        suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(c))
+     return suite
+ 
+ 

python-defusedxml.spec

@@ -1,20 +1,25 @@
-%global pypi_name defusedxml
-# define the license macro as doc if licensedir is not defined for
-# compatibility with EPEL
-%{!?_licensedir:%global license %%doc}
-
+%global pypi_name    defusedxml
+%global base_version 0.7.1
+#global prerel       ...
+%global upstream_version %{base_version}%{?prerel}
 Name:           python-%{pypi_name}
-Version:        0.6.0
-Release:        1%{?dist}
+Version:        %{base_version}%{?prerel:~%{prerel}}
+Release:        12%{?dist}
 Summary:        XML bomb protection for Python stdlib modules
 License:        Python
 URL:            https://github.com/tiran/defusedxml
-Source0:        %{pypi_source}
+Source0:        %{pypi_source %{pypi_name} %{upstream_version}}
+
+# Drop deprecated unittest.makeSuite()
+# From https://github.com/tiran/defusedxml/commit/4e6cea5f5b
+# (This no longer skips lxml tests when lxml is not installed.)
+Patch:          drop-makeSuite.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-lxml
 
 %description
 The defusedxml package contains several Python-only workarounds and fixes for
@@ -25,7 +30,7 @@ module.
 
 
 %package -n python%{python3_pkgversion}-%{pypi_name}
-Summary:        XML bomb protection for Python stdlib modules
+Summary:        %{summary}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
 %description -n python%{python3_pkgversion}-%{pypi_name}
@@ -37,7 +42,7 @@ module. This is the python%{python3_pkgversion} build.
 
 
 %prep
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{upstream_version}
 
 %build
 %py3_build
@@ -46,17 +51,83 @@ module. This is the python%{python3_pkgversion} build.
 %py3_install
 
 %check
-%{__python3} tests.py
+%{python3} tests.py
 
 
 %files -n python%{python3_pkgversion}-%{pypi_name}
 %doc README.txt README.html CHANGES.txt
 %license LICENSE
 %{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info/
+%{python3_sitelib}/%{pypi_name}-%{upstream_version}-py%{python3_version}.egg-info/
 
 
 %changelog
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 24 2023 Miro Hrončok <mhroncok@redhat.com> - 0.7.1-10
+- Run lxml tests during build, avoid deprecated unittest.makeSuite()
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.7.1-8
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.7.1-5
+- Rebuilt for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.7.1-2
+- Rebuilt for Python 3.10
+
+* Mon May 03 2021 Tomas Hrnciar <thrnciar@redhat.com> - 0.7.1-1
+- Update to 0.7.1
+- Fixes: rhbz#1935032
+
+* Wed Jan 27 2021 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc2-1
+- Update to 0.7.0rc2
+- Fixes: rhbz#1915522
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0~rc1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0~rc1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc1-2
+- Rebuilt for Python 3.9
+
+* Mon May 04 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc1-1
+- Update to 0.7.0rc1
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu May 09 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-1
 - Update to 0.6.0 (#1699639)
 - Remove Python 2 subpackage

sources

@@ -1 +1 @@
-SHA512 (defusedxml-0.6.0.tar.gz) = dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
+SHA512 (defusedxml-0.7.1.tar.gz) = 93c1e077b22a278011497f3b3f4409b5259e0077768caa121e0f078f80f39c082f3870eaaf4bad5166fe8c3b2d169ccdea62c2840ba6969240a8371cef34c4d5