[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2
nick.coghlan
python-checkins at python.org
Mon May 28 14:36:26 CEST 2012
http://hg.python.org/cpython/rev/cb716ee277cc
changeset: 77203:cb716ee277cc
parent: 77201:f26721ab3476
parent: 77202:3d61e27cc570
user: Nick Coghlan <ncoghlan at gmail.com>
date: Mon May 28 22:36:07 2012 +1000
summary:
Merge from 3.2
files:
Lib/distutils/command/bdist_rpm.py | 3 ++-
Misc/NEWS | 3 +++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -190,7 +190,7 @@
if self.fix_python:
self.python = sys.executable
else:
- self.python = "python"
+ self.python = "python3"
elif self.fix_python:
raise DistutilsOptionError(
"--python and --fix-python are mutually exclusive options")
@@ -320,6 +320,7 @@
rpm_cmd.append('-bb')
else:
rpm_cmd.append('-ba')
+ rpm_cmd.extend(['--define', '__python %s' % self.python])
if self.rpm3_mode:
rpm_cmd.extend(['--define',
'_topdir %s' % os.path.abspath(self.rpm_base)])
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,9 @@
Library
-------
+- Issue #14443: Tell rpmbuild to use the correct version of Python in
+ bdist_rpm. Initial patch by Ross Lagerwall.
+
- Issue14929: Stop Idle 3.x from closing on Unicode decode errors when grepping.
Patch by Roger Serwy.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list