From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 28 May 2012 12:34:46 +0000 (+1000)
Subject: Issue #14443: Tell rpmbuild to use the correct version of Python
X-Git-Tag: v3.3.0a4~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b6045c30fb47a89cd32ebedc2b8d2603cd72e33;p=thirdparty%2FPython%2Fcpython.git

Issue #14443: Tell rpmbuild to use the correct version of Python
---

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 357eaa575e6c..401bc4187270 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 2b457232f2e4..386d103ad65b 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.