[python-novaclient/el6: 4/4] Merge branch 'master' into el6

[Alan Pevec]

commit 3d146e67f999e976c7ddc3c7c0726cbd8ad320b5
Merge: 61dac7d 6d21a34
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Jan 30 20:08:09 2013 +0100

    Merge branch 'master' into el6

 python-novaclient.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc python-novaclient.spec
index 3a62ff5,538869e..e8574e8
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@@ -50,11 -55,9 +55,9 @@@ install -pm 644 tools/nova.bash_complet
  
  # Delete tests
  rm -fr %{buildroot}%{python_sitelib}/tests
- # Delete versioninfo file
- rm -fr %{buildroot}/usr/novaclient
  
  export PYTHONPATH="$( pwd ):$PYTHONPATH"
 -sphinx-build -b html doc/source html
 +sphinx-1.0-build -b html doc/source html
  
  # Fix hidden-file-or-dir warnings
  rm -fr html/.doctrees html/.buildinfo