spec file update for rpm, deb

Change-Id: Ib5a15cdde14b352609897b772223fb0fd25eff81

diff --git a/.gitreview b/.gitreview
index 8e0a5a34215a24ad68e440cdd5dddfeaf10e3d51..e3702287bae0b807ffbe08aaa5bd932e4bdf2a8d 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,6 @@
 [gerrit]
 host=gerrit.mirantis.com
-project=openstack-ci/openstack/cinder-build.git
-defaultremote=gerrit-mirantis
+port=29418
+project=openstack-ci/openstack/cinder-build
 defaultbranch=master
+

diff --git a/debian/control b/debian/control
index 1be8693f3d34f30cc942d58ac1547e212e2bc46b..df21adb576d391b46901435d0f95dce27c773ab9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep:
  python-coverage,
  python-eventlet (>= 0.13.0),
  python-fixtures (>= 0.3.14),
- python-glanceclient (>= 1:0.9.0),
+ python-glanceclient (>= 1:0.13.1 ),
  python-greenlet (>= 0.3.2),
  python-hacking,
  python-iso8601,
@@ -20,18 +20,18 @@ Build-Depends-Indep:
  python-migrate (>= 0.9.1),
  python-mock,
  python-mox,
- python-mysqldb        ,
- python-netaddr,
+ python-mysqldb,
+ python-netaddr (>= 0.7.6),
  python-novaclient (>= 2.17.0),
  python-oslo.config (>= 1.2.1),
- python-oslo.db,
- python-oslo.rootwrap,
- python-oslo.messaging,
+ python-oslo.db (>= 0.2.0),
+ python-oslo.rootwrap (>= 1.3.0),
+ python-oslo.messaging (>= 1.3.0),
  python-oslosphinx,
  python-paramiko (>= 1.13),
  python-paste,
  python-pastedeploy (>= 1.5),
- python-requests,
+ python-requests (>= 1.1),
  python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
  python-routes,
  python-setuptools,
@@ -39,9 +39,9 @@ Build-Depends-Indep:
  python-sphinx,
  python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
  python-stevedore (>= 0.14),
- python-suds,
+ python-suds (>= 0.4),
  python-swiftclient (>= 2.0.2),
- python-taskflow,
+ python-taskflow (>= 0.4),
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
  subunit,
@@ -58,9 +58,11 @@ Architecture: all
 Depends:
  python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
+ python-argparse,
  python-babel (>= 1.3),
  python-eventlet (>= 0.13.0),
- python-glanceclient (>= 1:0.9.0),
+ python-glanceclient (>= 1:0.13.1 ),
+ python-requests (>= 1.1),
  python-greenlet (>= 0.3.2),
  python-iso8601 (>= 0.1.9) ,
  python-keystoneclient (>= 1:0.3.0),
@@ -72,19 +74,25 @@ Depends:
  python-netaddr (>= 0.7.6),
  python-novaclient (>= 1:2.12.0),
  python-oslo.config (>= 1:1.2.1),
- python-oslo.messaging,
+ python-oslo.db (>= 0.2.0),
+ python-oslo.messaging (>= 1.3.0),
+ python-oslo.rootwrap (>= 1.3.0.0a1),
+ python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13),
  python-paste,
  python-pastedeploy (>= 1.5),
- python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (> 2.0),
+ python-crypto (>= 2.6),
+ python-barbicanclient (>= 2.1.0),
+ python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0),
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
  python-stevedore (>= 0.14),
- python-suds,
+ python-suds (>= 0.4),
  python-swiftclient (>= 2.0.2),
- python-taskflow,
+ python-taskflow (>= 0.4),
  python-rtslib-fb (>= 2.1.39),
  python-webob (>= 1.2.3),
+ python-wsgiref (>= 0.1.2),
  ${misc:Depends},
  ${python:Depends}
 Suggests: python-ceph, python-hp3parclient

diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..b4662c7
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,4 @@
+argparse python-argparse
+osprofiler python-osprofiler
+python_barbicanclient python-barbicanclient
+rtslib_fb python-rtslib-fb

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 63719318e363f19a0e5f8e136ef93e0bb2cf7e7e..f32ac6139a83714d5548ea1edbbabd3588714746 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -32,7 +32,7 @@ BuildRequires:    python-oslo-sphinx
 BuildRequires:    python-pbr
 BuildRequires:    python-sphinx
 BuildRequires:    python-setuptools
-BuildRequires:    python-netaddr
+BuildRequires:    python-netaddr >= 0.7.12
 
 Requires:         openstack-utils
 Requires:         python-cinder = %{version}-%{release}
@@ -66,43 +66,54 @@ Requires:         sysfsutils
 
 Requires:         python-paramiko >= 1.13.0
 
+Requires:         python-paste
+
 Requires:         python-qpid
 Requires:         python-kombu
 Requires:         python-amqplib
 
-Requires:         python-eventlet >= 0.13.0
+Requires:         python-eventlet >= 0.15.1
 Requires:         python-greenlet >= 0.3.2
 Requires:         python-iso8601 >= 0.1.9
-Requires:         python-netaddr >= 0.7.6
 Requires:         python-lxml >= 2.3
+Requires:         python-netaddr >= 0.7.12
+Requires:         python-oslo-config >= 1:1.4.0
+Requires:         python-oslo-db >= 1.0.0
+Requires:         python-oslo-messaging >= 1.4.0
+Requires:         python-oslo-rootwrap >= 1.3.0
+Requires:         python-osprofiler >= 0.3.0
 Requires:         python-anyjson >= 0.3.3
+Requires:         python-argparse
 #Requires:         python-cheetah
-Requires:         python-stevedore >= 0.14
-Requires:         python-suds
+Requires:         python-stevedore >= 1.0.0
+Requires:         python-suds >= 0.4
 
-Requires:         python-sqlalchemy  >= 0.8.4, python-sqlalchemy < 0.95, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
-Requires:         python-migrate >= 0.9.1
+Requires:         python-sqlalchemy  >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99
+Requires:         python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2
 
 Requires:         python-paste-deploy >= 1.5.0
+Requires:         python-crypto >= 2.6
+Requires:         python-barbicanclient >= 2.1.0
+Requires:         python-glanceclient >= 1:0.14.0
 Requires:         python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0
 Requires:         python-webob >= 1.2.3
+Requires:         python-wsgiref >= 0.1.2
+Requires:         python-oslo-i18n >= 1.0.0
 
-Requires:         python-glanceclient >= 1:0
-Requires:         python-swiftclient >= 2.0.2
-Requires:         python-keystoneclient 
+Requires:         python-swiftclient >= 2.2.0
+Requires:         python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0
+Requires:         python-keystoneclient
 Requires:         python-keystonemiddleware >= 1.0.0
-Requires:         python-novaclient >= 1:2.17
+Requires:         python-kombu >= 2.4.8
+Requires:         python-novaclient >= 1:2.18.0
 
-Requires:         python-oslo-config >= 1:1.2.0
 Requires:         python-six >= 1.7.0
 
 Requires:         python-babel >= 1.3
 Requires:         python-lockfile
 
-Requires:         python-oslo-rootwrap
-Requires:         python-rtslib-fb
-Requires:         python-taskflow
-Requires:         python-oslo-messaging >= 1.3.0-0.1.a9
+Requires:         python-rtslib-fb >= 2.1.fb39
+Requires:         python-taskflow >= 0.4
 
 Requires:         python-ceph
 #Requires:         iscsi-initiator-utils
@@ -444,5 +455,4 @@ fi
 - Require python-cinderclient
 
 * Mon Sep  3 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.2.f3
-- Initial release
-
+- Initial release
\ No newline at end of file