From: Maksym Yatsenko Date: Tue, 7 Oct 2014 16:20:10 +0000 (+0300) Subject: Update specs for rpm, deb: all differences were migrated X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=00ed34fae238bccbb5ec17148bc32cf62be70328;p=openstack-build%2Fcinder-build.git Update specs for rpm, deb: all differences were migrated from "master" branch to "fuel-6.0/2014.2" Change-Id: Icbb2baa3cca37f1c43619f35ffcc1ca8a9566e9c --- diff --git a/.gitreview b/.gitreview index e3702287b..a029f3a35 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,7 @@ host=gerrit.mirantis.com port=29418 project=openstack-ci/openstack/cinder-build -defaultbranch=master +defaultbranch=openstack-ci/fuel-6.0/2014.2 + + diff --git a/debian/control b/debian/control index df21adb57..94d854a80 100644 --- a/debian/control +++ b/debian/control @@ -7,45 +7,45 @@ Build-Depends-Indep: python-anyjson (>= 0.3.3), python-babel (>= 1.3), python-coverage, - python-eventlet (>= 0.13.0), + python-eventlet (>= 0.15.1), python-fixtures (>= 0.3.14), - python-glanceclient (>= 1:0.13.1 ), + python-glanceclient (>= 1:0.14.0 ), python-greenlet (>= 0.3.2), python-hacking, - python-iso8601, - python-keystoneclient (>= 1:0.4.2), + python-iso8601 (>= 0.1.9), + python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), - python-kombu (>= 2.5.12), + python-kombu (>= 2.5.0), python-lxml (>= 2.3), - python-migrate (>= 0.9.1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), python-mock, python-mox, python-mysqldb, - python-netaddr (>= 0.7.6), - python-novaclient (>= 2.17.0), - python-oslo.config (>= 1.2.1), - python-oslo.db (>= 0.2.0), + python-netaddr (>= 0.7.12), + python-novaclient (>= 2.18.0), + python-oslo.config (>= 1:1.4.0), + python-oslo.db (>= 1.0.0), python-oslo.rootwrap (>= 1.3.0), - python-oslo.messaging (>= 1.3.0), + python-oslo.messaging (>= 1.4.0), python-oslosphinx, - python-paramiko (>= 1.13), + python-paramiko (>= 1.13.0), python-paste, - python-pastedeploy (>= 1.5), - python-requests (>= 1.1), + python-pastedeploy (>= 1.5.0), + python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-routes, + python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0), python-setuptools, python-six (>= 1.7.0), 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-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.0.0), python-suds (>= 0.4), - python-swiftclient (>= 2.0.2), + python-swiftclient (>= 2.2.0), python-taskflow (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), - subunit, - testrepository (>= 0.0.17) + python-subunit (>=0.0.18), + testrepository (>= 0.0.18) Standards-Version: 3.9.4 Homepage: http://launchpad.net/cinder Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/juno/files @@ -60,35 +60,35 @@ Depends: python-anyjson (>= 0.3.3), python-argparse, python-babel (>= 1.3), - python-eventlet (>= 0.13.0), - python-glanceclient (>= 1:0.13.1 ), - python-requests (>= 1.1), + python-eventlet (>= 0.15.1), + python-glanceclient (>= 1:0.14.0 ), + python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-greenlet (>= 0.3.2), python-iso8601 (>= 0.1.9) , - python-keystoneclient (>= 1:0.3.0), + python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), - python-kombu (>= 2.5.12), - python-lockfile, + python-kombu (>= 2.5.0), + python-lockfile (>= 0.8), python-lxml (>= 2.3), - python-migrate (>= 0.9.1), - python-netaddr (>= 0.7.6), - python-novaclient (>= 1:2.12.0), - python-oslo.config (>= 1:1.2.1), - python-oslo.db (>= 0.2.0), - python-oslo.messaging (>= 1.3.0), - python-oslo.rootwrap (>= 1.3.0.0a1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), + python-netaddr (>= 0.7.12), + python-novaclient (>= 1:2.18.0), + python-oslo.config (>= 1:1.4.0), + python-oslo.db (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), + python-oslo.rootwrap (>= 1.3.0), python-osprofiler (>= 0.3.0), - python-paramiko (>= 1.13), + python-paramiko (>= 1.13.0), python-paste, - python-pastedeploy (>= 1.5), + python-pastedeploy (>= 1.5.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-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.0.0), python-suds (>= 0.4), - python-swiftclient (>= 2.0.2), + python-swiftclient (>= 2.2.0), python-taskflow (>= 0.4), python-rtslib-fb (>= 2.1.39), python-webob (>= 1.2.3), @@ -181,4 +181,4 @@ Description: Cinder storage service - Scheduler server . Cinder is the OpenStack Block storage service. . - This package contains the Cinder backup service. + This package contains the Cinder backup service. \ No newline at end of file diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index f32ac6139..1fef74a92 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -69,7 +69,7 @@ Requires: python-paramiko >= 1.13.0 Requires: python-paste Requires: python-qpid -Requires: python-kombu +Requires: python-kombu >= 2.5.0 Requires: python-amqplib Requires: python-eventlet >= 0.15.1 @@ -102,9 +102,8 @@ Requires: python-oslo-i18n >= 1.0.0 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-keystoneclient >= 1:0.10.0 Requires: python-keystonemiddleware >= 1.0.0 -Requires: python-kombu >= 2.4.8 Requires: python-novaclient >= 1:2.18.0 Requires: python-six >= 1.7.0 @@ -455,4 +454,4 @@ fi - Require python-cinderclient * Mon Sep 3 2012 Pádraig Brady - 2012.2-0.2.f3 -- Initial release \ No newline at end of file +- Initial release