[openstack-cinder] update to havana milestone 2
Pádraig Brady
pbrady at fedoraproject.org
Mon Jul 22 01:01:52 UTC 2013
commit f62d980ea0adc9bd355988b108bcb68ee379b9f6
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Jul 22 01:36:26 2013 +0100
update to havana milestone 2
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 8 +++---
0002-Allow-SQLAlchemy-0.8.patch | 22 --------------------
...ve-runtime-dep-on-python-pbr-python-d2to1.patch | 17 ++------------
openstack-cinder.spec | 16 +++++++-------
sources | 2 +-
6 files changed, 17 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35bdbfd..e8648e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cinder-2013.2.b1.tar.gz
+/cinder-2013.2.b2.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 0a17528..06521d5 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,15 +1,15 @@
-From 56f3d6a7b2cb88f9daa3a2573c790d8d8887581b Mon Sep 17 00:00:00 2001
+From 5c66adc93606f116018282a42c59c8105730ef17 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
(Note, this has not been sent upstream)
---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 40e564b..01bd3b4 100644
+index e27d458..7a2bf1a 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/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
similarity index 71%
rename from 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
rename to 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
index 4c65468..b7b9998 100644
--- a/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,13 +1,12 @@
-From aaa881c267d7023beac1ad1bc97178abcfb405cb Mon Sep 17 00:00:00 2001
+From 8429ce0fee20388a47a31eedaf00878cd05faa24 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
Requires RPM spec to fill in REDHATCINDERVERSION.
---
- cinder/version.py | 16 +++++++++++++---
- tools/pip-requires | 2 --
- 2 files changed, 13 insertions(+), 5 deletions(-)
+ cinder/version.py | 16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/cinder/version.py b/cinder/version.py
index ad1ebc0..b4f6fd8 100644
@@ -39,13 +38,3 @@ index ad1ebc0..b4f6fd8 100644
+
+version_info = VersionInfo()
version_string = version_info.version_string
-diff --git a/tools/pip-requires b/tools/pip-requires
-index 788b949..e93f9c2 100644
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -1,5 +1,3 @@
--d2to1>=0.2.10,<0.3
--pbr>=0.5,<0.6
- amqplib>=0.6.1
- anyjson>=0.2.4
- argparse
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index f9c6a3e..d80eba3 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,13 +2,13 @@
Name: openstack-cinder
Version: 2013.2
-Release: 0.2.b1%{?dist}
+Release: 0.3.b2%{?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-1/+download/cinder-%{version}.b1.tar.gz
+Source0: https://launchpad.net/cinder/havana/havana-1/+download/cinder-%{version}.b2.tar.gz
Source1: cinder.conf
Source2: cinder.logrotate
Source3: cinder-tgt.conf
@@ -20,11 +20,10 @@ Source12: openstack-cinder-volume.service
Source20: cinder-sudoers
#
-# patches_base=2013.2.b1
+# patches_base=2013.2.b2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Allow-SQLAlchemy-0.8.patch
-Patch0003: 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
BuildArch: noarch
BuildRequires: intltool
@@ -77,7 +76,6 @@ Requires: python-lxml
Requires: python-anyjson
Requires: python-cheetah
Requires: python-stevedore
-Requires: python-suds
Requires: python-sqlalchemy
Requires: python-migrate
@@ -127,11 +125,10 @@ This package contains documentation files for cinder.
%endif
%prep
-%setup -q -n cinder-%{version}.b1
+%setup -q -n cinder-%{version}.b2
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -287,6 +284,9 @@ fi
%endif
%changelog
+* Sun Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.3.b2
+- Update to Havana milestone 2
+
* Thu Jun 13 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.2.b1
- Update to Havana milestone 1
diff --git a/sources b/sources
index 6253ac0..278fb12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99b2e1dac1f8d568c061c389d0b4365c cinder-2013.2.b1.tar.gz
+36c1ee0070cb6f22f984316cd89b04a3 cinder-2013.2.b2.tar.gz
More information about the scm-commits
mailing list