Commit 9a7710b1 authored by Thomas Hisch's avatar Thomas Hisch

Reduce size of setuptools' bdist_rpm._make_spec_file

There are some setuptools specific changes in the bdist_rpm module that
are no longer needed, because the upstream/shipped version of distutils
already contains them. The code that is removed in this commit from
bdist_rpm is already part of the python-3.5 version of distutils.

Related: #2377
parent 4c29a512
There are some setuptools specific changes in the
`setuptools.command.bdist_rpm` module that are no longer needed, because
they are part of the `bdist_rpm` module in distutils in Python
3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
\ No newline at end of file
...@@ -8,8 +8,6 @@ class bdist_rpm(orig.bdist_rpm): ...@@ -8,8 +8,6 @@ class bdist_rpm(orig.bdist_rpm):
1. Run egg_info to ensure the name and version are properly calculated. 1. Run egg_info to ensure the name and version are properly calculated.
2. Always run 'install' using --single-version-externally-managed to 2. Always run 'install' using --single-version-externally-managed to
disable eggs in RPM distributions. disable eggs in RPM distributions.
3. Replace dash with underscore in the version numbers for better RPM
compatibility.
""" """
def run(self): def run(self):
...@@ -19,25 +17,15 @@ class bdist_rpm(orig.bdist_rpm): ...@@ -19,25 +17,15 @@ class bdist_rpm(orig.bdist_rpm):
orig.bdist_rpm.run(self) orig.bdist_rpm.run(self)
def _make_spec_file(self): def _make_spec_file(self):
version = self.distribution.get_version()
rpmversion = version.replace('-', '_')
spec = orig.bdist_rpm._make_spec_file(self) spec = orig.bdist_rpm._make_spec_file(self)
line23 = '%define version ' + version
line24 = '%define version ' + rpmversion
spec = [ spec = [
line.replace( line.replace(
"Source0: %{name}-%{version}.tar",
"Source0: %{name}-%{unmangled_version}.tar"
).replace(
"setup.py install ", "setup.py install ",
"setup.py install --single-version-externally-managed " "setup.py install --single-version-externally-managed "
).replace( ).replace(
"%setup", "%setup",
"%setup -n %{name}-%{unmangled_version}" "%setup -n %{name}-%{unmangled_version}"
).replace(line23, line24) )
for line in spec for line in spec
] ]
insert_loc = spec.index(line24) + 1
unmangled_version = "%define unmangled_version " + version
spec.insert(insert_loc, unmangled_version)
return spec return spec
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