summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2004-08-25 13:04:53 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2004-08-25 13:04:53 (GMT)
commitcae9e673d601a815c06d2755371cfcf89d314239 (patch)
treeb446e6841ca674e87878904bfe0482c95aca1ba2
parentcf525241bb14c29f747e5fa3045a57bc80a74557 (diff)
downloadcpython-cae9e673d601a815c06d2755371cfcf89d314239.zip
cpython-cae9e673d601a815c06d2755371cfcf89d314239.tar.gz
cpython-cae9e673d601a815c06d2755371cfcf89d314239.tar.bz2
Patch #970015: Replace - by _ in version and release.
-rw-r--r--Lib/distutils/command/bdist_rpm.py4
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 43181ea..5c8a757 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -332,8 +332,8 @@ class bdist_rpm (Command):
# definitions and headers
spec_file = [
'%define name ' + self.distribution.get_name(),
- '%define version ' + self.distribution.get_version(),
- '%define release ' + self.release,
+ '%define version ' + self.distribution.get_version().replace('-','_'),
+ '%define release ' + self.release.replace('-','_'),
'',
'Summary: ' + self.distribution.get_description(),
]
diff --git a/Misc/NEWS b/Misc/NEWS
index d3ffb04..cb49e0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,7 +57,8 @@ Extension modules
Library
-------
-- bdist_rpm now includes version and release in the BuildRoot.
+- bdist_rpm now includes version and release in the BuildRoot, and
+ replaces - by ``_`` in version and release.
- distutils build/build_scripts now has an -e option to specify the
path to the Python interpreter for installed scripts.