rpms/python-setuptools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to patch that I got in to upstream

Browse Source
This commit is contained in:
Toshio Kuratomi 2011-02-22 15:56:32 -08:00
parent d9f5a2d4b3
commit 8e9734fd2b
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
distribute-py32.patch
View File

@ -1,23 +1,24 @@
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,
changeset: 754:f64c2d57df43
branch: 0.6-maintenance
tag: tip
user: Toshio Kuratomi <toshio@fedoraproject.org>
date: Tue Feb 22 12:05:49 2011 -0800
summary: Fix for easy_install running on python-3.2
diff -r 5bc94690ee6c -r f64c2d57df43 setuptools/command/easy_install.py
--- a/setuptools/command/easy_install.py Sat Nov 06 15:01:33 2010 +0100
+++ b/setuptools/command/easy_install.py Tue Feb 22 12:05:49 2011 -0800
@@ -204,6 +204,12 @@
'exec_prefix': exec_prefix,
}
+ try:
+ self.config_vars['abiflags'] = sys.abiflags
+ except AttributeError:
+ # abiflags is only available on python-3.2+
+ pass
+ # Only python-3.2+ has sys.abiflags
+ self.config_vars['abiflags'] = ''
+
if HAS_USER_SITE:
self.config_vars['userbase'] = self.install_userbase
self.config_vars['usersite'] = self.install_usersite

5
python-setuptools.spec
View File

@ -8,7 +8,7 @@
Name: python-setuptools
Version: 0.6.14
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Easily build and distribute Python packages
Group: Applications/System
@ -138,6 +138,9 @@ rm -rf %{buildroot}
%endif # with_python3
%changelog
* Tue Feb 22 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.14-7
- Switch to patch that I got in to upstream
* Tue Feb 22 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.14-6
- Fix build on python-3.2