From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 3 Jul 2006 12:28:58 +0000 (+0000)
Subject: Bug #1267547: Put proper recursive setup.py call into the
X-Git-Tag: v2.5b2~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4548239e2b171ea9fa175744f17a32a884ab514a;p=python

Bug #1267547: Put proper recursive setup.py call into the
spec file generated by bdist_rpm.
---

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 738e3f7269..5b09965867 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -467,7 +467,8 @@ class bdist_rpm (Command):
 
         # rpm scripts
         # figure out default build script
-        def_build = "%s setup.py build" % self.python
+        def_setup_call = "%s %s" % (self.python,os.path.basename(sys.argv[0]))
+        def_build = "%s build" % def_setup_call
         if self.use_rpm_opt_flags:
             def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build
 
@@ -481,9 +482,9 @@ class bdist_rpm (Command):
             ('prep', 'prep_script', "%setup"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
-             ("%s setup.py install "
+             ("%s install "
               "--root=$RPM_BUILD_ROOT "
-              "--record=INSTALLED_FILES") % self.python),
+              "--record=INSTALLED_FILES") % def_setup_call),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),
diff --git a/Misc/NEWS b/Misc/NEWS
index 474010454a..4cb5cd37dc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,9 @@ Core and builtins
 Library
 -------
 
+- Bug #1267547: Put proper recursive setup.py call into the
+  spec file generated by bdist_rpm.
+
 - Bug #1514693: Update turtle's heading when switching between
   degrees and radians.