From 039c8c7f48b10285aff4422a3c32a9c79e408dbd Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Sep 25 2012 12:22:32 +0000
Subject: update to latest upstream release


---

diff --git a/.gitignore b/.gitignore
index 842bb75..681c0a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /python-novaclient-2012.1~rc1.tar.gz
 /python-novaclient-2012.1.tar.gz
 /python-novaclient-2012.2~f1.tar.gz
+/python-novaclient-2.8.0.26.tar.gz
diff --git a/novaclient-remove-argparse-from-egg-requires.patch b/novaclient-remove-argparse-from-egg-requires.patch
deleted file mode 100644
index 8a5d143..0000000
--- a/novaclient-remove-argparse-from-egg-requires.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mark McLoughlin <markmc@redhat.com>
-Subject: [PATCH] Remove argparse from egg requires.txt
-
-It looks like there is no egg info available for argparse on
-Fedora so the requirement can't be satisfied.
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 701295c..4bf80ac 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,8 +20,6 @@ import sys
- requirements = ["httplib2", "prettytable"]
- if sys.version_info < (2, 6):
-     requirements.append("simplejson")
--if sys.version_info < (2, 7):
--    requirements.append("argparse")
- 
- 
- def read_file(file_name):
diff --git a/python-novaclient.spec b/python-novaclient.spec
index b60fe9d..7c43af9 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,14 +1,13 @@
 Name:             python-novaclient
-Version:          2012.2
-Release:          0.3.f1%{?dist}
+Epoch:            1
+Version:          2.8.0.26
+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:          https://launchpad.net/nova/folsom/folsom-1/+download/python-novaclient-%{version}~f1.tar.gz
-
-Patch1:           novaclient-remove-argparse-from-egg-requires.patch
+Source0:          http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:        noarch
 BuildRequires:    python-setuptools
@@ -42,7 +41,8 @@ This package contains auto-generated documentation.
 %prep
 %setup -q
 
-%patch1 -p1
+# TODO: Have the following handle multi line entries
+sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
 %build
 %{__python} setup.py build
@@ -52,9 +52,11 @@ This package contains auto-generated documentation.
 
 # Delete tests
 rm -fr %{buildroot}%{python_sitelib}/tests
+# Delete versioninfo file
+rm -fr %{buildroot}/usr/novaclient
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html docs html
+sphinx-build -b html doc/source html
 
 # Fix hidden-file-or-dir warnings
 rm -fr html/.doctrees html/.buildinfo
@@ -70,6 +72,9 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Tue Sep 25 2012 Pádraig Brady <P@draigBrady.com> 1:2.8.0.26-1
+- Update to latest upstream release
+
 * Wed Aug 22 2012 Pádraig Brady <P@draigBrady.com> 2012.2-0.3.f1
 - Add dependency on python-setuptools (#849477)
 
diff --git a/sources b/sources
index 799864c..085f4f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f49eb3d77c8047cfc377d35d6cc5f8  python-novaclient-2012.2~f1.tar.gz
+43a88cd05fa4f8527afd38039e0d48f8  python-novaclient-2.8.0.26.tar.gz