Patch #970019: Include version and release in the BuildRoot.

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 4be99994978769e9a43be59dbbc41e683e43e25f..43181ea018b14a82bd6acc2f12c87cfbedc83965 100644 (file)
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -361,7 +361,7 @@ class bdist_rpm (Command):
         spec_file.extend([
             'License: ' + self.distribution.get_license(),
             'Group: ' + self.group,
-            'BuildRoot: %{_tmppath}/%{name}-buildroot',
+            'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot',
             'Prefix: %{_prefix}', ])
 
         # noarch if no extension modules

diff --git a/Misc/NEWS b/Misc/NEWS
index 9ce8c2d37956878eae8fa56b8a9236d99605b055..d3ffb0494b4c055f9b40e84c242d97a99f2367fc 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,8 @@ Extension modules
 Library
 -------
 
+- bdist_rpm now includes version and release in the BuildRoot.
+
 - distutils build/build_scripts now has an -e option to specify the
   path to the Python interpreter for installed scripts.