Fix rpm and deb packaging

Update fix-requiremets.patch and adding ceilometer client in rpm and
depb specs for building documentation.
Change-Id: I475fcd1d897866058d8cef0ec64de5906e65d91a

diff --git a/debian/control b/debian/control
index b5d6ec0721ffa07f7daa24956d3aba33044212b9..c3ed1ed67c0d70b4b97645fa9d82885005eaf8da 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep:
  python-greenlet,
  python-extras,
  python-glanceclient (>= 0.9.0),
+ python-ceilometerclient (>=1.0.6),
  python-cinderclient,
  python-heatclient,
  python-keystoneclient,

diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch
index 53345207a8c23ea6db6fd2d4001efd910b3875d7..961e40cf46a556937dca090af71bbdd0e29888b7 100644 (file)
--- a/debian/patches/fix-requirements.patch
+++ b/debian/patches/fix-requirements.patch
@@ -11,7 +11,7 @@ Index: heat/requirements.txt
  netaddr>=0.7.6
 -six>=1.6.0
 +six>=1.5.2
- sqlalchemy-migrate>=0.8.2,!=0.8.4
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
  python-novaclient>=2.17.0
  PasteDeploy>=1.5.0
 @@ -27,4 +27,3 @@

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 79139d9e259cdc5eee4a1cc957392a0f673a9bf2..111011087caf443ae269c2c75c898461b4d98def 100644 (file)
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -67,6 +67,7 @@ BuildRequires: python-novaclient
 BuildRequires: python-neutronclient
 BuildRequires: python-swiftclient
 BuildRequires: python-heatclient
+BuildRequires: python-ceilometerclient
 %endif
 
 Requires: %{name}-common = %{version}-%{release}