Patch #970015: Replace - by _ in version and release.

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 43181ea018b14a82bd6acc2f12c87cfbedc83965..5c8a7570b3bc8500f650723288ef299bae1f6f04 100644 (file)
--- 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 d3ffb0494b4c055f9b40e84c242d97a99f2367fc..cb49e0b71b1f1cdac8579945a1a3ff27d3846fb2 100644 (file)
--- 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.