[openstack-nova/el6-grizzly] update to stable/grizzly 2013.1.1 release

[Pádraig Brady]

commit 8795011bf1ac07ad394b3c0a68040dc1d2d03b21
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon May 13 15:57:24 2013 +0100

    update to stable/grizzly 2013.1.1 release
    
    Conflicts:
    
    	openstack-nova.spec

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...prove-handling-of-an-empty-dnsmasq-domain.patch |  116 --------------------
 openstack-nova.spec                                |   13 +-
 sources                                            |    2 +-
 5 files changed, 10 insertions(+), 124 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d0fcf2..9b097cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /nova-2013.1.rc1.tar.gz
 /nova-2013.1.rc2.tar.gz
 /nova-2013.1.tar.gz
+/nova-2013.1.1.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 6714a08..398ef25 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 e9dfdd80e3b04d38a002ca811ff887abd85359fe Mon Sep 17 00:00:00 2001
+From b6195e176337fd7fe7669c80d14052364be91758 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
diff --git a/openstack-nova.spec b/openstack-nova.spec
index e387d99..be20d68 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,14 +1,14 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-nova
-Version:          2013.1
-Release:          4%{?dist}
+Version:          2013.1.1
+Release:          1%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          https://launchpad.net/nova/grizzly/2013.1/+download/nova-2013.1.tar.gz
+Source0:          https://launchpad.net/nova/grizzly/2013.1/+download/nova-%{version}.tar.gz
 
 Source1:          nova.conf
 Source6:          nova.logrotate
@@ -45,10 +45,9 @@ Source21:         nova-polkit.pkla
 Source22:         nova-ifc-template
 
 #
-# patches_base=2013.1
+# patches_base=2013.1.1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-improve-handling-of-an-empty-dnsmasq-domain.patch
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-nova-newdeps.patch
@@ -387,7 +386,6 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 # Apply EPEL patch
 %patch100 -p1
@@ -814,6 +812,9 @@ fi
 %endif
 
 %changelog
+* Mon May 13 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.1-1
+- Update to stable/grizzly 2013.1.1 release
+
 * Mon May 13 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1-4
 - Make openstack-nova metapackage depend on openstack-nova-cells
 - Add a dependency on python-keystonclient (for auth middleware)
diff --git a/sources b/sources
index c03f76c..aada8c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38022353c398ce38c4e220d1d18b5916  nova-2013.1.tar.gz
+13636df2a0e357237791e1a2153b91c4  nova-2013.1.1.tar.gz