X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fopenstack-ceilometer-newdeps.patch;h=dc9f441263b0e97ce269a295d2f08179b123f8a4;hb=00988157a804c6b1d310b088d553461bb38c6c14;hp=ae8994ff78a5040f5b26e55f3e228a7ec8fb7071;hpb=83a861872b42b59992e91ae14efdbb03f5c3a5c1;p=openstack-build%2Fceilometer-build.git diff --git a/rpm/SOURCES/openstack-ceilometer-newdeps.patch b/rpm/SOURCES/openstack-ceilometer-newdeps.patch index ae8994f..dc9f441 100644 --- a/rpm/SOURCES/openstack-ceilometer-newdeps.patch +++ b/rpm/SOURCES/openstack-ceilometer-newdeps.patch @@ -1,10 +1,11 @@ -diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3/ceilometer/__init__.py ---- ceilometer-2013.1.g3.orig/ceilometer/__init__.py 2013-04-08 09:54:04.545469160 +0000 -+++ ceilometer-2013.1.g3/ceilometer/__init__.py 2013-04-08 10:01:12.306302227 +0000 -@@ -14,6 +14,28 @@ +diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1/ceilometer/__init__.py +--- ceilometer-2013.2.b1.orig/ceilometer/__init__.py 2013-05-30 15:09:28.000000000 +0000 ++++ ceilometer-2013.2.b1/ceilometer/__init__.py 2013-05-31 16:05:56.366704819 +0000 +@@ -13,3 +13,25 @@ + # License for the specific language governing permissions and limitations # under the License. # - ++ +import sys +import pkg_resources + @@ -26,13 +27,9 @@ diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3 + +replace_dist("WebOb >= 1.2") +replace_dist("SQLAlchemy >= 0.7.3") -+ - import gettext - - gettext.install('ceilometer', unicode=1) -diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py ---- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 09:54:04.608469135 +0000 -+++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 10:06:21.515180041 +0000 +diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py +--- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py 2013-05-30 15:09:28.000000000 +0000 ++++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py 2013-05-31 16:03:43.209551099 +0000 @@ -52,7 +52,13 @@