From 9c63215dec79f6b1643da92ce72725ae13fe3e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 May 2020 00:19:40 +0200 Subject: [PATCH] Update to 0.7.0rc1 Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1831331 Adds Python 3.9 compatibility, resolves https://bugzilla.redhat.com/show_bug.cgi?id=1817700 --- .gitignore | 1 + python-defusedxml.spec | 26 ++++++++++++++------------ sources | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index a04e75e..4b8bd60 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /defusedxml-0.4.1.tar.gz /defusedxml-0.5.0.tar.gz /defusedxml-0.6.0.tar.gz +/defusedxml-0.7.0rc1.tar.gz diff --git a/python-defusedxml.spec b/python-defusedxml.spec index 405e138..5993234 100644 --- a/python-defusedxml.spec +++ b/python-defusedxml.spec @@ -1,15 +1,14 @@ -%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.0 +%global prerel rc1 +%global upstream_version %{base_version}%{?prerel} Name: python-%{pypi_name} -Version: 0.6.0 -Release: 5%{?dist} +Version: %{base_version}%{?prerel:~%{prerel}} +Release: 1%{?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}} BuildArch: noarch @@ -25,7 +24,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 +36,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 +45,20 @@ 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 +* Mon May 04 2020 Miro HronĨok - 0.7.0~rc1-1 +- Update to 0.7.0rc1 + * Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6d596b7..80913bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (defusedxml-0.6.0.tar.gz) = dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226 +SHA512 (defusedxml-0.7.0rc1.tar.gz) = df60e833a1fec8f6fab433ed38ce89c92cb6fa40cde418b3e62eca4112891fabd8b3e111006cc89f5023896075130b7b41d9a23adfbab7e7432434598da4158a