diff --git a/python-enchant.spec b/python-enchant.spec index f0f9366..4715beb 100644 --- a/python-enchant.spec +++ b/python-enchant.spec @@ -3,16 +3,9 @@ %global enchant_dep enchant >= 1.5.0 %global srcname enchant -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: python-enchant Version: 2.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Python bindings for Enchant spellchecking library License: LGPLv2+ @@ -26,25 +19,6 @@ BuildRequires: enchant-devel PyEnchant is a spellchecking library for Python, based on the Enchant library by Dom Lachowicz. -%if %{with python2} -%package -n python2-%{srcname} -Summary: Python 2 bindings for Enchant spellchecking library - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -# For running tests -BuildRequires: python2-nose - -Requires: %{enchant_dep} - -Provides: PyEnchant - -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} -PyEnchant is a spellchecking library for Python 2, based on the Enchant -library by Dom Lachowicz. -%endif # with python2 %package -n python3-%{srcname} Summary: Python 3 bindings for Enchant spellchecking library @@ -67,61 +41,25 @@ library by Dom Lachowicz. # Remove bundled egg-info rm -rf py%{srcname}.egg-info -rm -rf %{py3dir} -cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' +find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %build -%if %{with python2} -CFLAGS="$RPM_OPT_FLAGS" %py2_build -%endif # with python2 - -pushd %{py3dir} -CFLAGS="$RPM_OPT_FLAGS" %py3_build -popd +%py3_build %install -pushd %{py3dir} %py3_install \ --single-version-externally-managed # Directories used in windows build rm -rf $RPM_BUILD_ROOT/%{python3_sitelib}/%{srcname}/lib rm -rf $RPM_BUILD_ROOT/%{python3_sitelib}/%{srcname}/share -popd -%if %{with python2} -%py2_install \ - --single-version-externally-managed -# Directories used in windows build -rm -rf $RPM_BUILD_ROOT/%{python2_sitelib}/%{srcname}/lib -rm -rf $RPM_BUILD_ROOT/%{python2_sitelib}/%{srcname}/share -%endif # with python2 + %check -%if %{with python2} -pushd $RPM_BUILD_ROOT/%{python2_sitelib} -# There is no dictionary for language C, need to use en_US -LANG=C.UTF-8 nosetests-2 -popd -%endif # with python2 - pushd $RPM_BUILD_ROOT/%{python3_sitelib} # There is no dictionary for language C, need to use en_US nosetests-3 popd -%if %{with python2} -%files -n python2-%{srcname} -%doc README.txt TODO.txt -%license LICENSE.txt -%dir %{python2_sitelib}/%{srcname} -%dir %{python2_sitelib}/%{srcname}/checker -%dir %{python2_sitelib}/%{srcname}/tokenize -%{python2_sitelib}/%{srcname}/*.py -%{python2_sitelib}/%{srcname}/*.py[co] -%{python2_sitelib}/%{srcname}/*/*.py -%{python2_sitelib}/%{srcname}/*/*.py[co] -%{python2_sitelib}/py%{srcname}-%{version}-py?.?.egg-info -%endif # with python2 %files -n python3-%{srcname} %doc README.txt TODO.txt @@ -142,6 +80,10 @@ popd %changelog +* Tue Sep 03 2019 Miro Hrončok - 2.0.0-10 +- Subpackage python2-enchant has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Fri Aug 16 2019 Miro Hrončok - 2.0.0-9 - Rebuilt for Python 3.8