From bc6f743a845821b0d09bce33edc9cfd8e9641e28 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Jan 27 2012 15:20:09 +0000
Subject: update to essex milestone 3


---

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 4e5b9ef..d520f2d 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:          0.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/essex-3/+download/python-novaclient-%{version}~e3.tar.gz
 
 Patch1:           novaclient-remove-argparse-from-egg-requires.patch
 
@@ -70,6 +68,9 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Fri Jan 27 2012 Pádraig Brady <P@draigBrady.com> - 2012.1-0.1.e3
+- Update to essex milestone 3
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.1-0.5.89bzr
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild