From 3fc9311b89c9509f8f4291cfb735a945cfb2919d Mon Sep 17 00:00:00 2001
From: Pádraig Brady
Date: Apr 08 2012 03:10:31 +0000
Subject: update to essex release
---
diff --git a/.gitignore b/.gitignore
index 37e25cb..899a58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/python-novaclient-2012.1~e3.tar.gz
/python-novaclient-2012.1~e4.tar.gz
/python-novaclient-2012.1~rc1.tar.gz
+/python-novaclient-2012.1.tar.gz
diff --git a/horizon-ignore-cache-dir.patch b/horizon-ignore-cache-dir.patch
deleted file mode 100644
index d8b8a28..0000000
--- a/horizon-ignore-cache-dir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 39e252ad056ff65c7c326095938deb1eb50c4b40 Mon Sep 17 00:00:00 2001
-From: Kiall Mac Innes
-Date: Wed, 21 Mar 2012 12:19:30 +0000
-Subject: [PATCH 1/1] Fixes bug #959262 - Prevent a failure to create the cache directory from causing an exception.
-
-Change-Id: Ia80b50b32f5e3d0e76f4a1b251e23bbd3c70666e
----
- novaclient/base.py | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/novaclient/base.py b/novaclient/base.py
-index 4badc84..ec78aa6 100644
---- a/novaclient/base.py
-+++ b/novaclient/base.py
-@@ -114,10 +114,10 @@ class Manager(utils.HookableMixin):
- try:
- os.makedirs(cache_dir, 0755)
- except OSError as e:
-- if e.errno == errno.EEXIST:
-- pass
-- else:
-- raise
-+ # NOTE(kiall): This is typicaly either permission denied while
-+ # attempting to create the directory, or the directory
-+ # already exists. Either way, don't fail.
-+ pass
-
- resource = obj_class.__name__.lower()
- filename = "%s-%s-cache" % (resource, cache_type.replace('_', '-'))
---
-1.7.4.1
-
diff --git a/python-novaclient.spec b/python-novaclient.spec
index f176189..babacd3 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,15 +1,14 @@
Name: python-novaclient
Version: 2012.1
-Release: 0.4.rc1%{?dist}
+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://launchpad.net/nova/essex/essex-rc1/+download/python-novaclient-%{version}~rc1.tar.gz
+Source0: http://launchpad.net/nova/essex/2012.1/+download/python-novaclient-%{version}.tar.gz
Patch1: novaclient-remove-argparse-from-egg-requires.patch
-Patch2: horizon-ignore-cache-dir.patch
BuildArch: noarch
BuildRequires: python-setuptools
@@ -43,7 +42,6 @@ This package contains auto-generated documentation.
%setup -q
%patch1 -p1
-%patch2 -p1
%build
%{__python} setup.py build
@@ -71,7 +69,8 @@ rm -fr html/.doctrees html/.buildinfo
%doc html
%changelog
-* Mon Mar 26 2012 Pádraig Brady 2012.1-???
+* Sun Apr 8 2012 Pádraig Brady
2012.1-1
+- Update to essex release
- Include LICENSE (#732695)
* Thu Mar 22 2012 Pádraig Brady
2012.1-0.4.rc1
diff --git a/sources b/sources
index 6e7756e..42d8cc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d969ff41c4f026c1d11b2795e5e43f2f python-novaclient-2012.1~rc1.tar.gz
+f654bce125e0fc4010448cc2701cdb42 python-novaclient-2012.1.tar.gz