[python-novaclient/el6] update to Essex release

[Pádraig Brady]

commit d0dbce11ba1e3df129315bf87470052d2fb0c9e3
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Apr 13 17:45:51 2012 +0100

    update to Essex release

 .gitignore                                         |    2 +-
 novaclient-remove-argparse-from-egg-requires.patch |   19 ++++++++-----------
 python-novaclient.spec                             |   16 ++++++++--------
 sources                                            |    2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b5a367..6c4cde5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/python-novaclient-2.6.1~bzr89.tar.gz
+/python-novaclient-2012.1.tar.gz
diff --git a/novaclient-remove-argparse-from-egg-requires.patch b/novaclient-remove-argparse-from-egg-requires.patch
index 5fe74fd..8a5d143 100644
--- a/novaclient-remove-argparse-from-egg-requires.patch
+++ b/novaclient-remove-argparse-from-egg-requires.patch
@@ -8,18 +8,15 @@ Fedora so the requirement can't be satisfied.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index b6e6720..66861cf 100644
+index 701295c..4bf80ac 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
- def read(fname):
-     return open(os.path.join(os.path.dirname(__file__), fname)).read()
- 
--requirements = ['httplib2', 'argparse', 'prettytable']
-+requirements = ['httplib2', 'prettytable']
+@@ -20,8 +20,6 @@ import sys
+ requirements = ["httplib2", "prettytable"]
  if sys.version_info < (2, 6):
-     requirements.append('simplejson')
+     requirements.append("simplejson")
+-if sys.version_info < (2, 7):
+-    requirements.append("argparse")
  
--- 
-1.7.4.4
-
+ 
+ def read_file(file_name):
diff --git a/python-novaclient.spec b/python-novaclient.spec
index 6feb719..211fbed 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,14 +1,12 @@
-%global bzrtag 89
-
 Name:             python-novaclient
-Version:          2.6.1
-Release:          0.5.%{bzrtag}bzr%{?dist}
+Version:          2012.1
+Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
 Group:            Development/Languages
 License:          ASL 2.0
 URL:              http://pypi.python.org/pypi/python-novaclient
-Source0:          http://nova.openstack.org/tarballs/python-novaclient-%{version}~bzr%{bzrtag}.tar.gz
+Source0:          http://launchpad.net/nova/essex/2012.1/+download/python-novaclient-%{version}.tar.gz
 
 Patch1:           novaclient-remove-argparse-from-egg-requires.patch
 
@@ -60,11 +58,9 @@ sphinx-1.0-build -b html docs html
 # Fix hidden-file-or-dir warnings
 rm -fr html/.doctrees html/.buildinfo
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %doc README.rst
+%doc LICENSE
 %{_bindir}/nova
 %{python_sitelib}/novaclient
 %{python_sitelib}/*.egg-info
@@ -73,6 +69,10 @@ rm -rf %{buildroot}
 %doc html
 
 %changelog
+* Sun Apr 13 2012 Pádraig Brady <P at draigBrady.com> 2012.1-1
+- Update to essex release
+- Include LICENSE (#732695)
+
 * Tue Aug 30 2011 Matt Domsch <mdomsch at fedoraproject.org> - 2.6.1-0.5.89bzr
 - trivial changes for el6
 
diff --git a/sources b/sources
index c614f28..42d8cc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9174a4bfcc46f7bf228a996bb27a24d1  python-novaclient-2.6.1~bzr89.tar.gz
+f654bce125e0fc4010448cc2701cdb42  python-novaclient-2012.1.tar.gz