--- distutils/command/bdist_rpm.py	2009-03-10 16:43:08.000000000 -0500
+++ distutils/command/bdist_rpm.py	2009-03-10 17:25:31.000000000 -0500
@@ -383,10 +383,21 @@
         list of strings (one per line).
         """
         # definitions and headers
+        version = self.distribution.get_version()
+        release = self.release.replace('-','_')
+        import re ; regex = '[^0-9\.]'
+        splits = re.split(regex,version,maxsplit=1)
+        firstnonalnumchar = re.findall(regex,version)
+        if len(splits) == 1:
+               pass
+        else:
+               version = splits[0]
+               release = "0." + release + "." + firstnonalnumchar[0] + splits[1]
         spec_file = [
             '%define name ' + self.distribution.get_name(),
             '%define version ' + self.distribution.get_version().replace('-','_'),
-            '%define release ' + self.release.replace('-','_'),
+            '%define version ' + version,
+            '%define release ' + release,
             '',
             'Summary: ' + self.distribution.get_description(),
             ]
@@ -411,8 +422,10 @@
         else:
             spec_file.append('Source0: %{name}-%{version}.tar.gz')
 
+        license = self.distribution.get_license()
+        if len(license.splitlines()) > 1: license = "Other"
         spec_file.extend([
-            'License: ' + self.distribution.get_license(),
+            'License: ' + license,
             'Group: ' + self.group,
             'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot',
             'Prefix: %{_prefix}', ])