From 765ca40c8d9b1875722fe86f54a8a92c4471fdb3 Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Thu, 4 Sep 2014 15:54:35 +0400
Subject: [PATCH] Fix patch for heat requirements

Change-Id: I6a2dbc1419e8f5ed05900adc23550e236c777208
---
 .gitreview                                                  | 5 +++++
 debian/control                                              | 2 ++
 ...d-compatability-patch-to-allow-smooth-migration-aw.patch | 6 +++---
 rpm/SPECS/openstack-heat.spec                               | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .gitreview

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 00000000..bbaba7c1
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.mirantis.com
+port=29418
+project=openstack-ci/openstack/heat-build
+defaultbranch=master
diff --git a/debian/control b/debian/control
index 756208b7..6dc84f37 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Build-Depends-Indep:
  python-novaclient,
  python-oslo.config,
  python-oslo.config,
+ python-oslo.i18n,
  python-oslo.messaging,
  python-oslo.db,
  python-oslosphinx,
@@ -49,6 +50,7 @@ Build-Depends-Indep:
  python-pastedeploy,
  python-routes,
  python-requests,
+ python-saharaclient,
  python-setuptools,
  python-six,
  python-sphinx (>= 1.1.2), python-sphinx (<< 1.2.0) | python-sphinx (>> 1.2.0),
diff --git a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
index 420ef584..3a0d6300 100644
--- a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
+++ b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
@@ -72,15 +72,15 @@ diff --git a/requirements.txt b/requirements.txt
 index eb33166..7da29a2 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -6,6 +6,7 @@ httplib2>=0.7.5
- iso8601>=0.1.9
+@@ -7,6 +7,7 @@ iso8601>=0.1.9
+ keystonemiddleware>=1.0.0
  kombu>=2.4.8
  lxml>=2.3
 +M2Crypto
  netaddr>=0.7.6
  oslo.config>=1.4.0.0a3
  oslo.db>=0.2.0  # Apache-2.0
-@@ -13,7 +14,6 @@ oslo.messaging>=1.3.0
+@@ -15,7 +16,6 @@ oslo.messaging>=1.3.0
  PasteDeploy>=1.5.0
  pbr>=0.6,!=0.7,<1.0
  posix_ipc
diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 5befcd29..86b319f2 100644
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -63,8 +63,10 @@ BuildRequires: python-pbr
 BuildRequires: python-d2to1
 %if 0%{?with_doc}
 BuildRequires: python-oslo-config >= 1.2.0
+BuildRequires: python-oslo-i18n
 BuildRequires: python-oslo-messaging >= 1.3.0
 BuildRequires: python-oslo-db >= 0.2.0
+BuildRequires: python-saharaclient
 BuildRequires: python-cinderclient
 BuildRequires: python-keystoneclient
 BuildRequires: python-novaclient
-- 
2.45.2