From 5f24f589b4d44e1925b95f62e8ccb259565c3b52 Mon Sep 17 00:00:00 2001 From: n0npax Date: Sun, 18 Nov 2018 20:04:10 +1100 Subject: [PATCH 1/2] Fix hardcoded bdist_rpm in Lib/distutils/command/bdist_rpm.py --- Lib/distutils/command/bdist_rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 02f10dd89d913b1..ee0e20f0b22b426 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -9,6 +9,7 @@ from distutils.util import get_platform from distutils.file_util import write_file from distutils.errors import * +from distutils.spawn import find_executable from distutils.sysconfig import get_python_version from distutils import log @@ -310,8 +311,7 @@ def run(self): # build package log.info("building RPMs") rpm_cmd = ['rpm'] - if os.path.exists('/usr/bin/rpmbuild') or \ - os.path.exists('/bin/rpmbuild'): + if find_executable('rpmbuild'): rpm_cmd = ['rpmbuild'] if self.source_only: # what kind of RPMs? From 38e6f2be380796ad20b8fa457f95dd2ba47ad92f Mon Sep 17 00:00:00 2001 From: n0npax Date: Sun, 18 Nov 2018 22:47:23 +1100 Subject: [PATCH 2/2] update Misc news (bpo-32281) --- .../NEWS.d/next/Library/2018-11-18-22-32-11.bpo-32281.DFs8d3.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2018-11-18-22-32-11.bpo-32281.DFs8d3.rst diff --git a/Misc/NEWS.d/next/Library/2018-11-18-22-32-11.bpo-32281.DFs8d3.rst b/Misc/NEWS.d/next/Library/2018-11-18-22-32-11.bpo-32281.DFs8d3.rst new file mode 100644 index 000000000000000..d33d1a2ada8a2ff --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-11-18-22-32-11.bpo-32281.DFs8d3.rst @@ -0,0 +1 @@ +Fix hardcoded rpmbuild paths in Lib/distutils/command/bdist_rpm.py