[openstack-cinder/el6-havana] update to havana milestone 2
Pádraig Brady
pbrady at fedoraproject.org
Mon Jul 22 01:02:42 UTC 2013
commit ce3a0a898e8b413af1d0932a1601e20787dccbc1
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Jul 22 02:00:02 2013 +0100
update to havana milestone 2
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 8 ++--
...-parallel-install-versions-of-epel-packag.patch | 30 +++++++-------
...ve-runtime-dep-on-python-pbr-python-d2to1.patch | 17 +------
0004-Adjust-pip-requires-for-EL6.patch | 45 --------------------
openstack-cinder.spec | 14 +++---
sources | 2 +-
7 files changed, 31 insertions(+), 86 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..edb1412 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 ccf17c30c6487b2f81787b2d681251fcbf5cd0ad 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/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index 9664952..6e73eb1 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 a9543b46ec803a5f15e947cfb580d89b92d2d2cd Mon Sep 17 00:00:00 2001
+From 09f474a22aa79e1fa13db7e66d1af7bc0e6b0dc1 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
@@ -11,35 +11,35 @@ Delve into pkg_resources a little to get it to modify sys.path,
so that our parallel installed egg takes precedence over the
system default module versions.
---
- bin/cinder-manage | 7 ++++---
- cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py | 7 ++++++-
- 3 files changed, 40 insertions(+), 4 deletions(-)
+ bin/cinder-manage | 7 +++----
+ cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py | 7 ++++++-
+ 3 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/bin/cinder-manage b/bin/cinder-manage
-index 8e0de60..02a30b5 100755
+index 021c1c8..c809b30 100755
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
-@@ -58,9 +58,6 @@ import os
- import sys
+@@ -60,10 +60,6 @@ import sys
import uuid
+ from oslo.config import cfg
-from sqlalchemy import create_engine, MetaData, Table
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
-
+-
# If ../cinder/__init__.py exists, add ../ to Python search path, so that
-@@ -87,6 +84,10 @@ from cinder.openstack.common import uuidutils
+ # it will override what happens to be installed in /usr/(local/)lib/python...
+@@ -87,6 +83,9 @@ from cinder.openstack.common import uuidutils
from cinder import utils
from cinder import version
+from sqlalchemy import create_engine, MetaData, Table
-+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.ext.declarative import declarative_base
-+
- FLAGS = flags.FLAGS
++from sqlalchemy.orm import sessionmaker
+ CONF = cfg.CONF
diff --git a/cinder/__init__.py b/cinder/__init__.py
index d765b08..720320e 100644
@@ -80,10 +80,10 @@ index d765b08..720320e 100644
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
-index 5365d9c..e2fcd83 100644
+index e2463bc..9ba7b73 100644
--- a/cinder/db/sqlalchemy/migration.py
+++ b/cinder/db/sqlalchemy/migration.py
-@@ -57,7 +57,12 @@ if (not hasattr(migrate, '__version__') or
+@@ -56,7 +56,12 @@ if (not hasattr(migrate, '__version__') or
# NOTE(jkoelker) Delay importing migrate until we are patched
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 86e6ab7..12c7445 100644
--- a/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,13 +1,12 @@
-From 67e06fb2924dbfe66cb889f96c0dd552e473bd3c Mon Sep 17 00:00:00 2001
+From 283315756c625cebafb49fce782e5bd860606d52 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 3a2357c..2b816d1 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 ef418c4..69dd056 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
@@ -23,12 +23,11 @@ Source120: openstack-cinder-volume.upstart
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-Use-updated-parallel-install-versions-of-epel-packag.patch
Patch0003: 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
-Patch0004: 0004-Adjust-pip-requires-for-EL6.patch
BuildArch: noarch
BuildRequires: intltool
@@ -84,7 +83,6 @@ Requires: python-lxml
Requires: python-anyjson
Requires: python-cheetah
Requires: python-stevedore
-Requires: python-suds
Requires: python-sqlalchemy0.7
Requires: python-migrate
@@ -133,12 +131,11 @@ 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
-%patch0004 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -301,6 +298,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