Rebuilt to provide python3-defusedxml

.gitignore

@@ -1,6 +1,3 @@
 /defusedxml-0.4.tar.gz
 /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

python-defusedxml.spec

@@ -1,20 +1,41 @@
-%global pypi_name    defusedxml
+# Enable Python 3 builds for Fedora + EPEL >6
-%global base_version 0.7.0
+%if 0%{?fedora} || 0%{?rhel} > 6
-%global prerel       rc2
+# If the definition isn't available for python3_pkgversion, define it
-%global upstream_version %{base_version}%{?prerel}
+%{?!python3_pkgversion:%global python3_pkgversion 3}
+%bcond_without  python3
+%else
+%bcond_with     python3
+%endif
+
+%global pypi_name defusedxml
+# define the license macro as doc if licensedir is not defined for
+# compatibility with EPEL
+%{!?_licensedir:%global license %%doc}
+
 Name:           python-%{pypi_name}
-Version:        %{base_version}%{?prerel:~%{prerel}}
+Version:        0.5.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        XML bomb protection for Python stdlib modules
 License:        Python
 URL:            https://github.com/tiran/defusedxml
-Source0:        %{pypi_source %{pypi_name} %{upstream_version}}
+Source0:        https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
+BuildRequires:  python2-devel
+# No python2-setuptools on EL 7
+BuildRequires:  python-setuptools
+
+%if 0%{with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 
+%if 0%{?with_python3_other}
+BuildRequires:  python%{python3_other_pkgversion}-setuptools
+BuildRequires:  python%{python3_other_pkgversion}-devel
+%endif # with_python3_other
+%endif # with_python3
+
 %description
 The defusedxml package contains several Python-only workarounds and fixes for
 denial of service and other vulnerabilities in Python's XML libraries. In order
@@ -22,9 +43,20 @@ to benefit from the protection you just have to import and use the listed
 functions / classes from the right defusedxml module instead of the original
 module.
 
+%package -n python2-%{pypi_name}
+Summary:        XML bomb protection for Python stdlib modules
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
+%description -n python2-%{pypi_name}
+The defusedxml package contains several Python-only workarounds and fixes for
+denial of service and other vulnerabilities in Python's XML libraries. In order
+to benefit from the protection you just have to import and use the listed
+functions / classes from the right defusedxml module instead of the original
+module. This is the Python 2 build.
+
+%if 0%{with_python3}
 %package -n python%{python3_pkgversion}-%{pypi_name}
-Summary:        %{summary}
+Summary:        XML bomb protection for Python stdlib modules
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
 %description -n python%{python3_pkgversion}-%{pypi_name}
@@ -34,78 +66,76 @@ to benefit from the protection you just have to import and use the listed
 functions / classes from the right defusedxml module instead of the original
 module. This is the python%{python3_pkgversion} build.
 
+%if 0%{?with_python3_other}
+%package -n python%{python3_other_pkgversion}-%{pypi_name}
+Summary:        XML bomb protection for Python stdlib modules
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
+
+%description -n python%{python3_other_pkgversion}-%{pypi_name}
+The defusedxml package contains several Python-only workarounds and fixes for
+denial of service and other vulnerabilities in Python's XML libraries. In order
+to benefit from the protection you just have to import and use the listed
+functions / classes from the right defusedxml module instead of the original
+module. This is the python%{python3_other_pkgversion} build.
+%endif # with_python3_other
+%endif # with_python3
 
 %prep
-%autosetup -p1 -n %{pypi_name}-%{upstream_version}
+%setup -q -n %{pypi_name}-%{version}
 
 %build
+%py2_build
+%if 0%{with_python3}
 %py3_build
+%if 0%{?with_python3_other}
+%py3_other_build
+%endif # with_python3_other
+%endif # with_python3
 
 %install
+%py2_install
+%if 0%{with_python3}
 %py3_install
+%if 0%{?with_python3_other}
+%py3_other_install
+%endif # with_python3_other
+%endif # with_python3
 
 %check
-%{python3} tests.py
+%{__python2} tests.py
+%if 0%{with_python3}
+%{__python3} tests.py
+%endif # with_python3
 
+%files -n python2-%{pypi_name}
+%doc README.txt README.html CHANGES.txt
+%license LICENSE
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
+%if 0%{with_python3}
 %files -n python%{python3_pkgversion}-%{pypi_name}
 %doc README.txt README.html CHANGES.txt
 %license LICENSE
-%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{upstream_version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
+%if 0%{?with_python3_other}
+%files -n python%{python3_other_pkgversion}-%{pypi_name}
+%doc README.txt README.html CHANGES.txt
+%license LICENSE
+%{python3_other_sitelib}/%{pypi_name}
+%{python3__other_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif # with_python3_other
+%endif # with_python3
 
 %changelog
-* Wed Jan 27 2021 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc2-1
+* Thu Aug 24 2023 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-3
-- Update to 0.7.0rc2
+- Rebuilt to provide python3-defusedxml
-- Fixes: rhbz#1915522
+- Fixes: rhbz#2233752
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0~rc1-4
+* Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Rebuilt to change main python from 3.4 to 3.6
-
-* 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
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-5
-- Rebuilt for Python 3.7
-
-* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.5.0-4
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
 * Fri Feb 10 2017 Adam Williamson <awilliam@redhat.com> - 0.5.0-1
 - Update to 0.5.0, drop merged/superseded patches

sources

@@ -1 +1 @@
-SHA512 (defusedxml-0.7.0rc2.tar.gz) = 337e439ad2bb5f7644fc7e692b3567e992065f7d2beda472886fded2810753d583de173468c2391c24e27ed1d3f46c7585d24d4239f4a958a34d899346b99486
+SHA512 (defusedxml-0.5.0.tar.gz) = 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452