[openstack-nova] update to folsom milestone 3

[Pádraig Brady]

commit dc2d210b47ac1dc3586d85c5434a9cacfe8ef483
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Aug 23 13:17:48 2012 +0100

    update to folsom milestone 3

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    8 +-
 0002-fix-useexisting-deprecation-warnings.patch    |   25 --------
 ...rotocol-case-handling-for-security-groups.patch |   62 --------------------
 openstack-nova.spec                                |   13 ++--
 sources                                            |    2 +-
 6 files changed, 12 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 962688d..3b2996e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /nova-2012.1~rc1.tar.gz
 /nova-2012.1.tar.gz
 /nova-2012.2~f1.tar.gz
+/nova-2012.2~f3.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index e49e0b5..0b711ee 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From b1707ce900149be87ec03f0156b27bbdf9ff05d4 Mon Sep 17 00:00:00 2001
+From 83de9eb2b8dd1b9eea559341f696b80251cc586b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
@@ -11,7 +11,7 @@ Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 8ced294..7df59cd 100644
+index 78feba4..c248667 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
 @@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('./'))
@@ -21,5 +21,5 @@ index 8ced294..7df59cd 100644
 -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
 +extensions = ['sphinx.ext.autodoc', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
  
- # autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
- # execute "export SPHINX_DEBUG=1" in your terminal to disable
+ todo_include_todos = True
+ 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 1de575a..bee4332 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,13 +2,13 @@
 
 Name:             openstack-nova
 Version:          2012.2
-Release:          0.4.f1%{?dist}
+Release:          0.1.f3%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          http://launchpad.net/nova/folsom/folsom-1/+download/nova-2012.2~f1.tar.gz
+Source0:          http://launchpad.net/nova/folsom/folsom-1/+download/nova-2012.2~f3.tar.gz
 Source1:          nova.conf
 Source6:          nova.logrotate
 
@@ -29,11 +29,9 @@ Source22:         nova-ifc-template
 Source24:         nova-sudoers
 
 #
-# patches_base=folsom-1
+# patches_base=folsom-3
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-fix-useexisting-deprecation-warnings.patch
-Patch0003: 0003-Fix-up-protocol-case-handling-for-security-groups.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -151,8 +149,6 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -348,6 +344,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 23 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.1.f3
+- Update to folsom milestone 3
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.4.f1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f816299..fdaf192 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be940e127bfa505c4e38339d628209aa  nova-2012.2~f1.tar.gz
+336c35fc4c3aefefb583a94385154d65  nova-2012.2~f3.tar.gz