diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-03-02 05:41:25 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-03-02 05:41:25 (GMT) |
| commit | d9ca384febde46ebc9210a13e15a2d7c4c021990 (patch) | |
| tree | 0e0b74e18b29ede8f024ab99884d19e2c7d1c922 /Lib/distutils/command/bdist_rpm.py | |
| parent | ccc5ae7ae13138eb3acf3a15e92983a49e53dd90 (diff) | |
| download | cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.zip cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.tar.gz cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.tar.bz2 | |
Merged revisions 70094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70094 | tarek.ziade | 2009-03-02 06:38:44 +0100 (Mon, 02 Mar 2009) | 1 line
removing the force-optimized option as discussed in #1533164
........
Diffstat (limited to 'Lib/distutils/command/bdist_rpm.py')
| -rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 3afdafe..452f950 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -125,18 +125,10 @@ class bdist_rpm(Command): ('quiet', 'q', "Run the INSTALL phase of RPM building in quiet mode"), - - # Forces the -O1 option when calling the install command, - # so the rpm contains all files needed for proper operation under - # SELinux. Some systems checks for this on build-time and will - # fail without this. - ('force-optimize', None, - "Forces the -O1 option when calling the install command"), - ] boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode', - 'no-autoreq', 'quiet', 'force-optimize'] + 'no-autoreq', 'quiet'] negative_opt = {'no-keep-temp': 'keep-temp', 'no-rpm-opt-flags': 'use-rpm-opt-flags', @@ -187,7 +179,6 @@ class bdist_rpm(Command): self.force_arch = None self.quiet = 0 - self.force_optimize = 1 def finalize_options(self): self.set_undefined_options('bdist', ('bdist_base', 'bdist_base')) @@ -492,14 +483,8 @@ class bdist_rpm(Command): # that we open and interpolate into the spec file, but the defaults # are just text that we drop in as-is. Hmmm. - # forcing -O1 if force-optimize - if self.force_optimize: - optimize = ' -O1' - else: - optimize = '' - - install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT ' - '--record=INSTALLED_FILES') % (def_setup_call, optimize) + install_cmd = ('%s install -O1 --root=$RPM_BUILD_ROOT ' + '--record=INSTALLED_FILES') % def_setup_call script_options = [ ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"), |