- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

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

.gitignore

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

python-defusedxml.spec

@@ -1,41 +1,20 @@
-# Enable Python 3 builds for Fedora + EPEL >6
-%if 0%{?fedora} || 0%{?rhel} > 6
-# If the definition isn't available for python3_pkgversion, define it
-%{?!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}
-
+%global pypi_name    defusedxml
+%global base_version 0.7.1
+#global prerel       ...
+%global upstream_version %{base_version}%{?prerel}
 Name:           python-%{pypi_name}
-Version:        0.5.0
-Release:        7%{?dist}
+Version:        %{base_version}%{?prerel:~%{prerel}}
+Release:        4%{?dist}
 Summary:        XML bomb protection for Python stdlib modules
 License:        Python
 URL:            https://github.com/tiran/defusedxml
-Source0:        https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        %{pypi_source %{pypi_name} %{upstream_version}}
 
 BuildArch:      noarch
 
-BuildRequires:  python2-devel
-# No python2-setuptools on EL 7
-BuildRequires:  python2-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
@@ -43,20 +22,9 @@ 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:        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}
@@ -66,70 +34,74 @@ 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
-%setup -q -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{upstream_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
-%{__python2} tests.py
-%if 0%{with_python3}
-%{__python3} tests.py
-%endif # with_python3
+%{python3} tests.py
 
-%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}-%{version}-py?.?.egg-info
+%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypi_name}-%{upstream_version}-py%{python3_version}.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
+* 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
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (defusedxml-0.5.0.tar.gz) = 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
+SHA512 (defusedxml-0.7.1.tar.gz) = 93c1e077b22a278011497f3b3f4409b5259e0077768caa121e0f078f80f39c082f3870eaaf4bad5166fe8c3b2d169ccdea62c2840ba6969240a8371cef34c4d5