From 4b6045c30fb47a89cd32ebedc2b8d2603cd72e33 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Mon, 28 May 2012 22:34:46 +1000 Subject: Issue #14443: Tell rpmbuild to use the correct version of Python --- Lib/distutils/command/bdist_rpm.py | 3 ++- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 357eaa5..401bc41 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -190,7 +190,7 @@ class bdist_rpm(Command): 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 @@ class bdist_rpm(Command): 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 index 2b45723..386d103 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -67,6 +67,9 @@ Core and Builtins 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. -- cgit v0.12