[openstack-cinder] Update to 2013.2
Eric Harney
eharney at fedoraproject.org
Thu Oct 17 17:24:15 UTC 2013
commit 7e4b638d214caf5639e58f95fb5924279015dc85
Author: Eric Harney <eharney at redhat.com>
Date: Thu Oct 17 10:36:39 2013 -0400
Update to 2013.2
Updated patches from master-patches
.gitignore | 2 +-
...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 +-
openstack-cinder.spec | 13 ++++++++-----
sources | 2 +-
6 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1202de9..b893f55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cinder-2013.2.rc3.tar.gz
+/cinder-2013.2.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 5ae3ce0..888c0e1 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 93370dddaf2edd9dbd601697677707cc50486681 Mon Sep 17 00:00:00 2001
+From 33151b294b3447da6cb0d8b2d4c5b8b3d85da5cc 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 718610f..5ddc3a8 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 be07304488ce384c12def0839630f927eeb7da40 Mon Sep 17 00:00:00 2001
+From bf26f142db507f401290f99eb20829abc9b1930b 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 49815a2..c99755e 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 4b3fd34b0faf2a574d43cdccfd9edf126313f021 Mon Sep 17 00:00:00 2001
+From 5109fb1f45b454d177d7db4752c0fe3ca959b936 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 36d7f47..45aaee5 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,13 +2,13 @@
Name: openstack-cinder
Version: 2013.2
-Release: 0.13.rc3%{?dist}
+Release: 1%{?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-rc3/+download/cinder-%{version}.rc3.tar.gz
+Source0: https://launchpad.net/cinder/havana/%{version}/+download/cinder-%{version}.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.rc3
+# patches_base=2013.2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -132,7 +132,7 @@ This package contains documentation files for cinder.
%endif
%prep
-%setup -q -n cinder-%{version}.rc3
+%setup -q -n cinder-%{version}
%patch0001 -p1
%patch0002 -p1
@@ -295,7 +295,10 @@ fi
%endif
%changelog
-* Wed Oct 16 2013 Eric Harney <eharney at redhat.com> - 2013.2.0.13.rc3
+* Thu Oct 17 2013 Eric Harney <eharney at redhat.com> - 2013.2-1
+- Update to 2013.2 (Havana)
+
+* Wed Oct 16 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.13.rc3
- Update to Havana RC3
* Fri Oct 11 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.12.rc2
diff --git a/sources b/sources
index 439d18b..2ba3981 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f076d8942b368402576579c11e090e7 cinder-2013.2.rc3.tar.gz
+ab2aa0e29454fc5088638705e8dcf152 cinder-2013.2.tar.gz
More information about the scm-commits
mailing list