[openstack-nova] update to Essex milestone 4

[Pádraig Brady]

commit b1681b2d8ba6b0de045dda02c5e177381ea05658
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Mar 2 02:00:31 2012 +0000

    update to Essex milestone 4

 .gitignore                                         |    1 +
 0002-fix-nova-manage-image-convert-exception.patch |   27 --------------------
 openstack-nova.spec                                |   11 +++----
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 018fb96..da5809c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nova-2011.3.1~20120117.10818.tar.gz
 /nova-2011.3.1.tar.gz
 /nova-2012.1~e3.tar.gz
+/nova-2012.1~e4.tar.gz
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 1d80e06..b932282 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -5,13 +5,13 @@ Version:          2012.1
 # The Release is in form 0.X.tag as per:
 #   http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
 # So for prereleases always increment X
-Release:          0.4.e3%{?dist}
+Release:          0.5.e4%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          http://launchpad.net/nova/essex/essex-3/+download/nova-%{version}~e3.tar.gz
+Source0:          http://launchpad.net/nova/essex/essex-4/+download/nova-%{version}~e4.tar.gz
 Source1:          nova.conf
 Source6:          nova.logrotate
 
@@ -32,10 +32,9 @@ Source22:         nova-ifc-template
 Source23:         openstack-nova-db-setup
 
 #
-# patches_base=essex-3
+# patches_base=essex-4
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-fix-nova-manage-image-convert-exception.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -171,7 +170,6 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -360,7 +358,8 @@ fi
 %endif
 
 %changelog
-* ... TBD ...
+* Fri Mar  2 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.5.e4
+- Update to Essex milestone 4.
 - explicitly select the libvirt firewall driver in default nova.conf.
 - Add dependency on python-iso8601.
 - Enable --force_dhcp_release.
diff --git a/sources b/sources
index 142bb66..efab1fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dd860f0f4a6a93e4ec17ff46969e222  nova-2012.1~e3.tar.gz
+9e7a2a430e0bf8353f93ea4b6e0c2151  nova-2012.1~e4.tar.gz