X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-ceilometer.spec;h=0ba7244ea06fb742e569cd39039debf3e1fd7a41;hb=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.1.1%2F2014.1.1;hp=cdee4bdefcf61b38b438ae338941293b3ef2906f;hpb=e0d54b44858c0e7952d6d1c41c2345a9ccc0b0eb;p=openstack-build%2Fceilometer-build.git diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index cdee4bd..0ba7244 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -29,11 +29,6 @@ Source150: %{name}-alarm-evaluator.upstart Source16: %{name}-notification.init Source160: %{name}-notification.upstart -# -# patches_base=2014.1.1 -# -Patch0001: 0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch - # This is EL6 specific and not upstream Patch100: openstack-ceilometer-newdeps.patch @@ -48,7 +43,7 @@ BuildRequires: python2-devel BuildRequires: openstack-utils # These are required to build due to the requirements check added -BuildRequires: python-sqlalchemy0.7 +BuildRequires: python-sqlalchemy BuildRequires: python-webob1.2 @@ -73,21 +68,26 @@ Requires: python-anyjson Requires: python-jsonpath-rw Requires: python-stevedore >= 0.14 Requires: python-msgpack -Requires: python-six >= 1.6 +Requires: python-six Requires: PyYAML Requires: python-argparse +Requires: python-croniter >= 0.3.4 Requires: python-jsonschema +Requires: python-lockfile >= 0.8 Requires: python-netaddr +Requires: python-pbr Requires: python-requests -Requires: python-sqlalchemy0.7 +Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99 Requires: python-alembic -Requires: python-migrate +Requires: python-migrate >= 0.8.2, python-migrate < 0.8.4, python-migrate > 0.8.4 +Requires: python-happybase >= 0.5, python-happybase < 0.7, python-happybase > 0.7 Requires: python-webob >= 1.2.3 Requires: python-oslo-config >= 1:1.2.0 +Requires: python-oslo.vmware >= 0.2 Requires: pysnmp Requires: pytz @@ -247,7 +247,7 @@ Group: Documentation # Required to build module documents BuildRequires: python-eventlet -BuildRequires: python-sqlalchemy0.7 +BuildRequires: python-sqlalchemy BuildRequires: python-webob # while not strictly required, quiets the build down when building docs. BuildRequires: python-migrate, python-iso8601 @@ -262,8 +262,6 @@ This package contains documentation files for ceilometer. %prep %setup -q -n ceilometer-%{version} -%patch0001 -p1 - # Apply EL6 patch %patch100 -p1