diff --git a/python-argh.spec b/python-argh.spec index 53f43ff..647b0c7 100644 --- a/python-argh.spec +++ b/python-argh.spec @@ -1,9 +1,3 @@ -%if 0%{?fedora} || 0%{?rhel} >= 8 -%bcond_without python3 -%else # 0#{?fedora} || 0#{?rhel} >= 8 -%bcond_with python3 -%endif # 0#{?fedora} || 0#{?rhel} >= 8 - %global pypi_name argh %global global_sum Unobtrusive argparse wrapper with natural syntax %global global_desc \ @@ -17,12 +11,12 @@ tool; %{name} just makes it easy to use. Name: python-%{pypi_name} Version: 0.26.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: %{global_sum} License: LGPLv3+ URL: https://pypi.python.org/pypi/%{pypi_name} -Source0: https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: %{pypi_source} Source1: https://www.gnu.org/licenses/lgpl-3.0.txt Source2: https://www.gnu.org/licenses/gpl-3.0.txt @@ -36,29 +30,6 @@ BuildRequires: glibc-langpack-en %{global_desc} -%package -n python2-%{pypi_name} -Summary: %{global_sum} - -BuildRequires: python2-devel -BuildRequires: python2-mock -%if %{with python3} -BuildRequires: python2-pytest -%else # with python3 -BuildRequires: python2-pytest -%endif # with python3 -BuildRequires: python2-setuptools -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: python-argparse -Requires: python-argparse -%endif - -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -%{global_desc} - - -%if %{with python3} %package -n python3-%{pypi_name} Summary: %{global_sum} @@ -71,7 +42,6 @@ BuildRequires: python3-setuptools %description -n python3-%{pypi_name} %{global_desc} -%endif # with python3 %prep @@ -82,45 +52,27 @@ BuildRequires: python3-setuptools %build -%py2_build -%if %{with python3} %py3_build -%endif # with python3 %install -%if %{with python3} %py3_install -%endif # with python3 -%py2_install %check -# tests need UTF-8 encoding -LANG="en_US.UTF-8" -LC_CTYPE=C.utf8 -export LANG LC_CTYPE -%{__python2} setup.py test -%if %{with python3} %{__python3} setup.py test -%endif # with python3 -%files -n python2-%{pypi_name} -%doc README.rst -%license COPYING gpl-3.0.txt -%{python2_sitelib}/* - - -%if %{with python3} %files -n python3-%{pypi_name} %doc README.rst %license COPYING gpl-3.0.txt -%{python3_sitelib}/* -%endif # with python3 +%{python3_sitelib}/argh*/ %changelog +* Wed Jul 24 2019 Miro HronĨok - 0.26.1-13 +- Drop python2-argh + * Sat Feb 02 2019 Fedora Release Engineering - 0.26.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild