[openstack-cinder] Update to Icehouse milestone 1

[Eric Harney]

commit 8c00612f7e5109b65bae1479b2ba52f6df3642b0
Author: Eric Harney <eharney at redhat.com>
Date:   Mon Nov 25 11:32:02 2013 -0500

    Update to Icehouse milestone 1
    
    Updated patches from master-patches

 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...ve-runtime-dep-on-python-pbr-python-d2to1.patch |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    2 +-
 ...-set-correct-filename-when-cloning-volume.patch |   64 --------------------
 openstack-cinder.spec                              |   15 +++--
 sources                                            |    2 +-
 6 files changed, 12 insertions(+), 75 deletions(-)
---
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 888c0e1..591147b 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 33151b294b3447da6cb0d8b2d4c5b8b3d85da5cc Mon Sep 17 00:00:00 2001
+From bdda3b2dba35f59dc97402f94b239f9085d7acb2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Fri, 21 Sep 2012 13:33:26 +0100
 Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
index 5ddc3a8..f72a2c2 100644
--- a/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,4 +1,4 @@
-From bf26f142db507f401290f99eb20829abc9b1930b Mon Sep 17 00:00:00 2001
+From eb68370d625f0f9072ae395d072639a2cab748c9 Mon Sep 17 00:00:00 2001
 From: Eric Harney <eharney at redhat.com>
 Date: Thu, 13 Jun 2013 17:50:12 -0400
 Subject: [PATCH] Remove runtime dep on python-pbr, python-d2to1
diff --git a/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index c99755e..2e867d4 100644
--- a/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From 5109fb1f45b454d177d7db4752c0fe3ca959b936 Mon Sep 17 00:00:00 2001
+From 91202fcba5587190facb6c86185330987b3d8078 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Mon, 22 Jul 2013 03:10:04 +0100
 Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index a8f230d..1c0b936 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,14 +1,14 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2013.2
-Release:          2%{?dist}
+Version:          2014.1
+Release:          0.1.b1%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://www.openstack.org/software/openstack-storage/
-Source0:          https://launchpad.net/cinder/havana/%{version}/+download/cinder-%{version}.tar.gz
+Source0:          https://launchpad.net/cinder/icehouse/icehouse-1/+download/cinder-%{version}.b1.tar.gz
 Source1:          cinder-dist.conf
 Source2:          cinder.logrotate
 Source3:          cinder-tgt.conf
@@ -21,12 +21,11 @@ Source13:         openstack-cinder-backup.service
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.2
+# patches_base=2014.1.b1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
 Patch0003: 0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
-Patch0004: 0004-GlusterFS-set-correct-filename-when-cloning-volume.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -133,12 +132,11 @@ This package contains documentation files for cinder.
 %endif
 
 %prep
-%setup -q -n cinder-%{version}
+%setup -q -n cinder-%{version}.b1
 
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -297,6 +295,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 19 2013 Eric Harney <eharney at redhat.com> - 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+
 * Mon Oct 28 2013 Eric Harney <eharney at redhat.com> - 2013.2-2
 - Fix GlusterFS volume driver clone operations
 
diff --git a/sources b/sources
index 2ba3981..cc8f800 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab2aa0e29454fc5088638705e8dcf152  cinder-2013.2.tar.gz
+2e62031aba56b382285ba59e9523e972  cinder-2014.1.b1.tar.gz