diff --git a/.gitignore b/.gitignore index 1ac5b21..abfb808 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /roman-2.0.0.zip /python-roman-3.0.tar.gz +/python-roman-3.1.tar.gz diff --git a/python-roman.spec b/python-roman.spec index 48d26a5..8e0da8f 100644 --- a/python-roman.spec +++ b/python-roman.spec @@ -1,15 +1,8 @@ -%if 0%{?fedora} > 12 -%bcond_without python3 -%else -%bcond_with python3 -%endif - - %global pypi_name roman Name: python-%{pypi_name} -Version: 3.0 -Release: 2%{?dist} +Version: 3.1 +Release: 1%{?dist} Summary: Integer to Roman numerals converter License: Python @@ -17,32 +10,19 @@ URL: https://pypi.python.org/pypi/roman Source0: https://github.com/zopefoundation/%{pypi_name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%if %{with python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif %global _description\ Integer to Roman numerals converter %description %_description -%package -n python2-%{pypi_name} -Summary: %summary -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} %_description - -%if %{with python3} %package -n python3-%{pypi_name} Summary: Integer to Roman numerals converter %description -n python3-%{pypi_name} Integer to Roman numerals converter -%endif %prep %setup -q -n %{pypi_name}-%{version} @@ -51,42 +31,28 @@ rm -rf %{pypi_name}.egg-info %build -%py2_build -%if %{with python3} %py3_build -%endif %install -%if %{with python3} %py3_install -%endif - -%py2_install %check -%if %{with python3} export PYTHON=%{__python3} %{__python3} setup.py test -%endif - -export PYTHON=%{__python2} -%{__python2} setup.py test -%files -n python2-%{pypi_name} -%{python2_sitelib}/%{pypi_name}.py* -%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info - -%if %{with python3} %files -n python3-%{pypi_name} %{python3_sitelib}/%{pypi_name}.py* %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/__pycache__/%{pypi_name}.cpython-* -%endif %changelog +* Wed Feb 20 2019 Matthias Runge - 3.1-1 +- update to 3.1 +- remove python2 subpackage (rbhz#1676851) + * Sat Feb 02 2019 Fedora Release Engineering - 3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 78ceb97..3a858b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-roman-3.0.tar.gz) = 7d4d0085498bb403378263d372fd55d345034d59d2b6b94ab403c3fccab4d53c601fef01f004fe2f6fe992f4865ada92e1c0f962b338ec89acb5a054749ef887 +SHA512 (python-roman-3.1.tar.gz) = 5e8e66fc0bf41e365e3e0d568c239eb4ac66d8a5e9fbd09b48f5c07a766ad89454c0a389aec543a6f7226f0546a21bb01081523e8abfaf8e6157d593d492217e