diff --git a/distribute-py32.patch b/distribute-py32.patch new file mode 100644 index 0000000..cb1ea22 --- /dev/null +++ b/distribute-py32.patch @@ -0,0 +1,23 @@ +diff -up distribute-0.6.14/setuptools/command/easy_install.py.bak distribute-0.6.14/setuptools/command/easy_install.py +--- distribute-0.6.14/setuptools/command/easy_install.py.bak 2011-02-22 09:50:37.899769278 -0800 ++++ distribute-0.6.14/setuptools/command/easy_install.py 2011-02-22 10:03:06.662931661 -0800 +@@ -191,7 +191,6 @@ class easy_install(Command): + + py_version = sys.version.split()[0] + prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix') +- + self.config_vars = {'dist_name': self.distribution.get_name(), + 'dist_version': self.distribution.get_version(), + 'dist_fullname': self.distribution.get_fullname(), +@@ -203,6 +202,11 @@ class easy_install(Command): + 'sys_exec_prefix': exec_prefix, + 'exec_prefix': exec_prefix, + } ++ try: ++ self.config_vars['abiflags'] = sys.abiflags ++ except AttributeError: ++ # abiflags is only available on python-3.2+ ++ pass + + if HAS_USER_SITE: + self.config_vars['userbase'] = self.install_userbase diff --git a/python-setuptools.spec b/python-setuptools.spec index 1008bee..1ddf108 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -17,6 +17,7 @@ URL: http://pypi.python.org/pypi/%{srcname} Source0: http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz Source1: psfl.txt Source2: zpl.txt +Patch0: distribute-py32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -60,6 +61,7 @@ This package contains the distribute fork of setuptools. %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 -b .py32 find -name '*.txt' | xargs chmod -x find . -name '*.orig' -exec rm \{\} \; @@ -136,6 +138,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Tue Feb 22 2011 Toshio Kuratomi - 0.6.14-4 +- Fix build on python-3.2 + * Tue Aug 10 2010 Toshio Kuratomi - 0.6.14-3 - Update description to mention this is distribute