Commit 07d3e934 authored by Martin v. Löwis's avatar Martin v. Löwis

Bug #1267547: Put proper recursive setup.py call into the

spec file generated by bdist_rpm.
parent 5baff4dd
...@@ -467,7 +467,8 @@ class bdist_rpm (Command): ...@@ -467,7 +467,8 @@ class bdist_rpm (Command):
# rpm scripts # rpm scripts
# figure out default build script # 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: if self.use_rpm_opt_flags:
def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build
...@@ -481,9 +482,9 @@ class bdist_rpm (Command): ...@@ -481,9 +482,9 @@ class bdist_rpm (Command):
('prep', 'prep_script', "%setup"), ('prep', 'prep_script', "%setup"),
('build', 'build_script', def_build), ('build', 'build_script', def_build),
('install', 'install_script', ('install', 'install_script',
("%s setup.py install " ("%s install "
"--root=$RPM_BUILD_ROOT " "--root=$RPM_BUILD_ROOT "
"--record=INSTALLED_FILES") % self.python), "--record=INSTALLED_FILES") % def_setup_call),
('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"), ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
('verifyscript', 'verify_script', None), ('verifyscript', 'verify_script', None),
('pre', 'pre_install', None), ('pre', 'pre_install', None),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment