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

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

.gitignore

@@ -1,3 +1,4 @@
 /defusedxml-0.4.tar.gz
 /defusedxml-0.4.1.tar.gz
 /defusedxml-0.5.0.tar.gz
+/defusedxml-0.6.0.tar.gz

python-defusedxml.spec

@@ -1,41 +1,21 @@
-# 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}
 
 Name:           python-%{pypi_name}
-Version:        0.5.0
-Release:        1%{?dist}
+Version:        0.6.0
+Release:        2%{?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}
 
 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
@@ -43,18 +23,7 @@ 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
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
@@ -66,70 +35,54 @@ 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}-%{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
 
-%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}-%{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
+* 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
 - Enable Python 3 build for EPEL 7, per https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL

sources

@@ -1 +1 @@
-SHA512 (defusedxml-0.5.0.tar.gz) = 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
+SHA512 (defusedxml-0.6.0.tar.gz) = dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226