diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 09:55:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 09:55:57 -0400 |
| commit | 54af685555b1ebce9a27bb95f94a58423554ec5f (patch) | |
| tree | 379ca46b2d254340b2ae448f25bf53c9ae0a452b | |
| parent | a60ba76395353974f5bb51ad1c117d7239ed5032 (diff) | |
| parent | 9a7710b1ef1bef6c3d8ad6427e87ee886860b40e (diff) | |
| download | python-setuptools-git-54af685555b1ebce9a27bb95f94a58423554ec5f.tar.gz | |
Merge pull request #2380 from thisch/bdist-rpm
Reduce size of setuptools' bdist_rpm._make_spec_file
| -rw-r--r-- | changelog.d/2380.change.rst | 4 | ||||
| -rw-r--r-- | setuptools/command/bdist_rpm.py | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/changelog.d/2380.change.rst b/changelog.d/2380.change.rst new file mode 100644 index 00000000..e68d1080 --- /dev/null +++ b/changelog.d/2380.change.rst @@ -0,0 +1,4 @@ +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 diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py index 70730927..0eb1b9c2 100644 --- a/setuptools/command/bdist_rpm.py +++ b/setuptools/command/bdist_rpm.py @@ -8,8 +8,6 @@ class bdist_rpm(orig.bdist_rpm): 1. Run egg_info to ensure the name and version are properly calculated. 2. Always run 'install' using --single-version-externally-managed to disable eggs in RPM distributions. - 3. Replace dash with underscore in the version numbers for better RPM - compatibility. """ def run(self): @@ -19,25 +17,15 @@ class bdist_rpm(orig.bdist_rpm): orig.bdist_rpm.run(self) def _make_spec_file(self): - version = self.distribution.get_version() - rpmversion = version.replace('-', '_') spec = orig.bdist_rpm._make_spec_file(self) - line23 = '%define version ' + version - line24 = '%define version ' + rpmversion spec = [ line.replace( - "Source0: %{name}-%{version}.tar", - "Source0: %{name}-%{unmangled_version}.tar" - ).replace( "setup.py install ", "setup.py install --single-version-externally-managed " ).replace( "%setup", "%setup -n %{name}-%{unmangled_version}" - ).replace(line23, line24) + ) for line in spec ] - insert_loc = spec.index(line24) + 1 - unmangled_version = "%define unmangled_version " + version - spec.insert(insert_loc, unmangled_version) return spec |