diff --git a/python-enchant-1.6.5-disable-distribute-setup.patch b/python-enchant-1.6.5-disable-distribute-setup.patch new file mode 100644 index 0000000..9844584 --- /dev/null +++ b/python-enchant-1.6.5-disable-distribute-setup.patch @@ -0,0 +1,14 @@ +diff -up pyenchant-1.6.5/setup.py.disable-distribute-setup pyenchant-1.6.5/setup.py +--- pyenchant-1.6.5/setup.py.disable-distribute-setup 2013-08-06 09:08:02.620478114 +0200 ++++ pyenchant-1.6.5/setup.py 2013-08-06 09:08:13.130744158 +0200 +@@ -6,8 +6,8 @@ + # + + +-import distribute_setup +-distribute_setup.use_setuptools() ++#import distribute_setup ++#distribute_setup.use_setuptools() + from setuptools import setup, find_packages, Extension + from distutils.archive_util import make_archive + diff --git a/python-enchant.spec b/python-enchant.spec index 294c0f4..e4ac8c8 100644 --- a/python-enchant.spec +++ b/python-enchant.spec @@ -2,7 +2,7 @@ Name: python-enchant Version: 1.6.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Python bindings for Enchant spellchecking library Group: Development/Languages @@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: python-enchant-1.6.5-fix-tests-without-X.patch Patch1: python-enchant-1.6.5-fix-docstring-test.patch +# python-distribute got merged into python-setuptools +Patch2: python-enchant-1.6.5-disable-distribute-setup.patch BuildArch: noarch BuildRequires: enchant-devel @@ -56,6 +58,7 @@ library by Dom Lachowicz. %setup -q -n pyenchant-%{version} %patch0 -p1 -b .fix-tests-without-X %patch1 -p1 -b .fix-docstring-test +%patch2 -p1 -b .disable-distribute-setup %if 0%{?with_python3} rm -rf %{py3dir} @@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 06 2013 Radek Novacek 1.6.5-12 +- Disable distribute setup + * Sun Aug 04 2013 Fedora Release Engineering - 1.6.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild