diff --git a/python-prettytable.spec b/python-prettytable.spec index 84c84a0..5e8a455 100644 --- a/python-prettytable.spec +++ b/python-prettytable.spec @@ -1,15 +1,9 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} - -%if 0%{?fedora} > 12 || 0%{?rhel} > 7 -%global with_python3 1 -%endif - %global modname prettytable Name: python-%{modname} Version: 0.7.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Python library to display tabular data in tables License: BSD @@ -17,13 +11,9 @@ Source0: http://pypi.python.org/packages/source/P/PrettyTable/%{modname}-%{ve URL: http://pypi.python.org/pypi/PrettyTable BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif %global _description\ @@ -36,15 +26,9 @@ a row range. %description %_description -%package -n python2-%{modname} -Summary: %summary -%{?python_provide:%python_provide python2-%{modname}} - -%description -n python2-%{modname} %_description - -%if 0%{?with_python3} %package -n python3-%{modname} Summary: Python library to display tabular data in tables +%{?python_provide:%python_provide python3-%{modname}} %description -n python3-%{modname} PrettyTable is a simple Python library designed to make it quick and easy to @@ -53,56 +37,23 @@ the ASCII tables used in the PostgreSQL shell psql. PrettyTable allows for selection of which columns are to be printed, independent alignment of columns (left or right justified or centred) and printing of "sub-tables" by specifying a row range. -%endif %prep %setup -q -n %{modname}-%{version} -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build -%py2_build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif +%py3_build %check -export LANG=en_GB.utf8 -%{__python2} %{modname}_test.py - -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} %{modname}_test.py -popd -%endif %install -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -popd -%endif - -%py2_install +%py3_install -%files -n python2-%{modname} -%{!?_licensedir:%global license %%doc} -%license COPYING -%doc README CHANGELOG -%{python2_sitelib}/%{modname}.py* -%{python2_sitelib}/%{modname}-%{version}* - -%if 0%{?with_python3} %files -n python3-%{modname} %{!?_licensedir:%global license %%doc} %license COPYING @@ -110,10 +61,13 @@ popd %{python3_sitelib}/%{modname}.py* %{python3_sitelib}/__pycache__/%{modname}* %{python3_sitelib}/%{modname}-%{version}* -%endif %changelog +* Sun Nov 17 2019 Miro Hrončok - 0.7.2-21 +- Subpackage python2-prettytable has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Thu Oct 03 2019 Miro Hrončok - 0.7.2-20 - Rebuilt for Python 3.8.0rc1 (#1748018)