[BACKPORT] Stable fixes and refactorings to Trunk

bzr revid: jvo@tinyerp.com-20100520063044-sviy1e9pybirhpsw

1 files changed, 9 insertions, 6 deletions

diff --git a/setup.py b/setup.py
index 38426f83df5..cb51961ed3c 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin"))
 
 execfile(join('bin', 'release.py'))
 
-if sys.argv[1] == 'bdist_rpm':
+if 'bdist_rpm' in sys.argv:
     version = version.split('-')[0]
 
 # get python short version
@@ -177,11 +177,14 @@ options = {
         "compressed": 1,
         "optimize": 2,
         "dist_dir": 'dist',
-        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
-                     "lxml.objectify", "decimal", "xml", "encodings",
-                     "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-                     "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                     "HTMLParser", "select", "yaml", "pywebdav"],
+        "packages": [
+                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
+                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
+                 "HTMLParser", "select", "mako", "poplib",
+                 "imaplib", "smtplib", "email", "yaml","pywebdav",
+                 ],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }