diff --git a/el6-compat.patch b/el6-compat.patch index 6f70c13..61c5f59 100644 --- a/el6-compat.patch +++ b/el6-compat.patch @@ -15,14 +15,14 @@ diff -ru sphinxcontrib.orig/spelling/checker.py sphinxcontrib/spelling/checker.p +++ sphinxcontrib/spelling/checker.py 2016-07-20 11:57:02.379702000 -0400 @@ -18,7 +18,10 @@ """ - - def __init__(self, lang, suggest, word_list_filename, filters=[]): + + def __init__(self, lang, suggest, word_list_filename, tokenizer_lang='en_US', filters=[]): - self.dictionary = enchant.DictWithPWL(lang, word_list_filename) + if word_list_filename is None: + self.dictionary = enchant.Dict(lang) + else: + self.dictionary = enchant.DictWithPWL(lang, word_list_filename) - self.tokenizer = get_tokenizer(lang, filters) + self.tokenizer = get_tokenizer(tokenizer_lang, filters) self.original_tokenizer = self.tokenizer self.suggest = suggest diff -ru sphinxcontrib.orig/spelling/tests/test_builder.py sphinxcontrib/spelling/tests/test_builder.py diff --git a/python-sphinxcontrib-spelling.spec b/python-sphinxcontrib-spelling.spec index 51406a2..8920e2f 100644 --- a/python-sphinxcontrib-spelling.spec +++ b/python-sphinxcontrib-spelling.spec @@ -7,18 +7,19 @@ %global with_python3 1 %endif -%if 0%{?el6} - %global __python2 %{__python} - %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +%if 0%{?el7} + %global py2_major %{nil} %endif -%if 0%{?rhel} < 8 +%if 0%{?el6} %global py2_major %{nil} + %global __python2 %{__python} + %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %endif Name: python-%{pypi_name} -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: %{sum} License: BSD @@ -33,10 +34,10 @@ BuildRequires: python%{py2_major}-nose BuildRequires: python%{py2_major}-six BuildRequires: python-enchant BuildRequires: python%{py2_major}-sphinx +BuildRequires: hunspell-en +BuildRequires: hunspell-de %if 0%{?el6} -BuildRequires: enchant-aspell -BuildRequires: aspell-en Patch0: el6-compat.patch %endif @@ -92,7 +93,7 @@ misspelled words. %endif %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p0 -n %{pypi_name}-%{version} %if 0%{?el6} %patch0 @@ -104,8 +105,6 @@ misspelled words. # Remove bundled egg-info rm -rf %{pypi_name}.egg-info -# Remove shebangs -find sphinxcontrib -name "*.py" -exec sed -i -e '/^#!\//, 1d' '{}' \; %build @@ -149,6 +148,9 @@ nosetests %endif %changelog +* Sun Jan 01 2017 Avram Lubkin - 2.3.0-1 +- Update to 2.3.0 + * Mon Dec 19 2016 Miro HronĨok - 2.1.2-3 - Rebuild for Python 3.6 diff --git a/sphinxcontrib-spelling-2.3.0.tar.gz b/sphinxcontrib-spelling-2.3.0.tar.gz new file mode 100644 index 0000000..d08426e Binary files /dev/null and b/sphinxcontrib-spelling-2.3.0.tar.gz differ