[openstack-cinder] Update to Havana rc1
Eric Harney
eharney at fedoraproject.org
Tue Oct 8 16:14:49 UTC 2013
commit 6811812a4e0cd6f36c76deea6869061227ffa4cc
Author: Eric Harney <eharney at redhat.com>
Date: Tue Oct 8 08:09:34 2013 -0400
Update to Havana rc1
Fix python-novaclient req epoch
Updated patches from master-patches
.gitignore | 3 +--
...e-don-t-access-the-net-when-building-docs.patch | 4 ++--
...ve-runtime-dep-on-python-pbr-python-d2to1.patch | 4 ++--
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 14 +++++++-------
openstack-cinder.spec | 14 +++++++++-----
sources | 2 +-
6 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8648e2..6c6147d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/cinder-2013.2.b1.tar.gz
-/cinder-2013.2.b2.tar.gz
+/cinder-2013.2.rc1.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 1065ede..88d16dc 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 c44bbcccf3c42fce5d4ce9ec52f28e291fac3b4b Mon Sep 17 00:00:00 2001
+From c617721f7fb025284f8dbaededcfb6bcb4610fa4 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Ensure we don't access the net when building docs
1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index e27d458..7a2bf1a 100644
+index 97ee288..238a922 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,7 +29,6 @@ sys.path.insert(0, os.path.abspath('./'))
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 1312ac4..935278a 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 4b727d52aef20f1a9adf74ce5298b1979ed6a4bb Mon Sep 17 00:00:00 2001
+From 6fe826d58987a8b2d12a87857191fa55977bd692 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
@@ -9,7 +9,7 @@ Requires RPM spec to fill in REDHATCINDERVERSION.
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/cinder/version.py b/cinder/version.py
-index ad1ebc0..b4f6fd8 100644
+index 09d1ee3..e34979f 100644
--- a/cinder/version.py
+++ b/cinder/version.py
@@ -14,12 +14,22 @@
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 fa8319a..3d59566 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 eb9a23b255a60a5ff2910c80720e16dd2be53776 Mon Sep 17 00:00:00 2001
+From 6343780dbbb0ebe98700d6b47008651ed063b321 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"
@@ -20,8 +20,8 @@ Conflicts:
doc/source/_theme/layout.html | 95 +++++++++
doc/source/_theme/theme.conf | 5 +
doc/source/conf.py | 8 +-
- test-requirements.txt | 1 -
- 12 files changed, 1121 insertions(+), 6 deletions(-)
+ test-requirements.txt | 2 +-
+ 12 files changed, 1122 insertions(+), 6 deletions(-)
create mode 100644 doc/source/_static/.gitignore
create mode 100644 doc/source/_static/.placeholder
create mode 100644 doc/source/_static/basic.css
@@ -1201,7 +1201,7 @@ index 0000000..e039fe0
+pygments_style = friendly
+
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7a2bf1a..01bd3b4 100644
+index 238a922..58fc367 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,9 +33,7 @@ extensions = ['sphinx.ext.autodoc',
@@ -1227,12 +1227,12 @@ index 7a2bf1a..01bd3b4 100644
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
-index 3d8e9bf..f83b20b 100644
+index 35f6c82..f83b20b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
-@@ -12,5 +12,4 @@ sphinx>=1.1.2
+@@ -12,4 +12,4 @@ sphinx>=1.1.2
python-subunit
testtools>=0.9.32
testrepository>=0.0.17
-oslo.sphinx
- python-novaclient>=2.12.0
++python-novaclient>=2.12.0
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 3856b39..aa98ab0 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,13 +2,13 @@
Name: openstack-cinder
Version: 2013.2
-Release: 0.10.b3%{?dist}
+Release: 0.11.rc1%{?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-3/+download/cinder-%{version}.b3.tar.gz
+Source0: https://launchpad.net/cinder/havana/havana-rc1/+download/cinder-%{version}.rc1.tar.gz
Source1: cinder-dist.conf
Source2: cinder.logrotate
Source3: cinder-tgt.conf
@@ -21,7 +21,7 @@ Source13: openstack-cinder-backup.service
Source20: cinder-sudoers
#
-# patches_base=2013.2.b3
+# patches_base=2013.2.rc1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -92,7 +92,7 @@ Requires: python-webob
Requires: python-glanceclient >= 1:0
Requires: python-swiftclient >= 1.2
Requires: python-keystoneclient
-Requires: python-novaclient >= 2.15
+Requires: python-novaclient >= 1:2.15
Requires: python-oslo-config >= 1:1.2.0
Requires: python-six
@@ -132,7 +132,7 @@ This package contains documentation files for cinder.
%endif
%prep
-%setup -q -n cinder-%{version}.b3
+%setup -q -n cinder-%{version}.rc1
%patch0001 -p1
%patch0002 -p1
@@ -295,6 +295,10 @@ fi
%endif
%changelog
+* Tue Oct 08 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.11.rc1
+- Update to Havana RC1
+- Fix python-novaclient req epoch
+
* Mon Sep 23 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.10.b3
- Depend on python-novaclient 2.15
diff --git a/sources b/sources
index 828b1df..ad1b473 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beae8f17c84ff974db3913f35e541121 cinder-2013.2.b3.tar.gz
+908284e0055a5458c8a7328d852e1614 cinder-2013.2.rc1.tar.gz
More information about the scm-commits
mailing list