[Python-checkins] r47213 - in python/trunk: Lib/distutils/command/bdist_rpm.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Jul  3 14:28:58 2006
New Revision: 47213

Modified:
   python/trunk/Lib/distutils/command/bdist_rpm.py
   python/trunk/Misc/NEWS
Log:
Bug #1267547: Put proper recursive setup.py call into the
spec file generated by bdist_rpm.


Modified: python/trunk/Lib/distutils/command/bdist_rpm.py
==============================================================================
--- python/trunk/Lib/distutils/command/bdist_rpm.py	(original)
+++ python/trunk/Lib/distutils/command/bdist_rpm.py	Mon Jul  3 14:28:58 2006
@@ -467,7 +467,8 @@
 
         # 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 @@
             ('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),

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Jul  3 14:28:58 2006
@@ -22,6 +22,9 @@
 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.