[openstack-cinder/el6-havana] Update to Havana rc2

Eric Harney eharney at fedoraproject.org
Tue Oct 15 16:32:32 UTC 2013


commit 5259acd1bcc566ed4a318b1448312eacf0b7c965
Author: Eric Harney <eharney at redhat.com>
Date:   Tue Oct 15 12:20:36 2013 -0400

    Update to Havana rc2
    
    Updated patches from el6-havana-patches

 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...-parallel-install-versions-of-epel-packag.patch |    2 +-
 ...ve-runtime-dep-on-python-pbr-python-d2to1.patch |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    2 +-
 openstack-cinder.spec                              |   11 +++++++----
 5 files changed, 11 insertions(+), 8 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 ba363c3..a6cff3a 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 da36f9affecf1cd34b8c1d052eaae6912fcb4f63 Mon Sep 17 00:00:00 2001
+From b451bd91ae412a0c5b0eabcaf80b6e76516ea110 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-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index cdef673..fac301e 100644
--- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 067be25241d9ee5e32fcca81e71a316da39c99f9 Mon Sep 17 00:00:00 2001
+From 79ca23e5b31ac3bf9197b8b2b15d2ae755a6f9f9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Wed, 24 Oct 2012 13:44:37 +0100
 Subject: [PATCH] Use updated parallel install versions of epel package
diff --git a/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
index 92c7ac8..605e856 100644
--- a/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,4 +1,4 @@
-From 116a011cd4061a70d2bee8c7a2c460c6f24cad8d Mon Sep 17 00:00:00 2001
+From e1a252d69eca516cfe6897ddd49a2e6d62cf5c01 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/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 363b2b2..c255ab6 100644
--- a/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From da442c0b3fe03c19bb2a6208248c5bbbedf7e57c Mon Sep 17 00:00:00 2001
+From 9957c70b3f6e7dd4853f8ba769f5078fd3d7d8cc 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:14:27 +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 c12b0bb..329de64 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,13 +2,13 @@
 
 Name:             openstack-cinder
 Version:          2013.2
-Release:          0.11.rc1%{?dist}
+Release:          0.12.rc2%{?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/havana-rc1/+download/cinder-%{version}.rc1.tar.gz
+Source0:          https://launchpad.net/cinder/havana/havana-rc2/+download/cinder-%{version}.rc2.tar.gz
 Source1:          cinder-dist.conf
 Source2:          cinder.logrotate
 Source3:          cinder-tgt.conf
@@ -25,7 +25,7 @@ Source130:        openstack-cinder-backup.upstart
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.2.rc1
+# patches_base=2013.2.rc2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -140,7 +140,7 @@ This package contains documentation files for cinder.
 %endif
 
 %prep
-%setup -q -n cinder-%{version}.rc1
+%setup -q -n cinder-%{version}.rc2
 
 %patch0001 -p1
 %patch0002 -p1
@@ -312,6 +312,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 15 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.12.rc2
+- Update to Havana RC2
+
 * Tue Oct 08 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.11.rc1
 - Update to Havana RC1
 - Fix python-novaclient req epoch


More information about the scm-commits mailing list