[openstack-heat] Update to icehouse-1

[Jeff Peeler]

commit 35fdca4a53a5a14180a70151af908fd289f47e25
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Tue Dec 10 15:30:06 2013 -0500

    Update to icehouse-1

 .gitignore          |    1 +
 openstack-heat.spec |   22 ++++++++++++++--------
 sources             |    2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50cea51..b7b5dbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /heat-2013.2.rc1.tar.gz
 /heat-2013.2.rc2.tar.gz
 /heat-2013.2.tar.gz
+/heat-2014.1.b1.tar.gz
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 2f2d025..5481546 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,18 +1,18 @@
-%global release_name havana
-%global release_letter rc
-%global milestone 2
-%global full_release heat-%{version}
+%global release_name icehouse
+%global release_letter b
+%global milestone 1
+%global full_release heat-%{version}.%{release_letter}%{milestone}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
-Version:	2013.2
-Release:	1.0%{?dist}
+Version:	2014.1
+Release:	0.1.%{release_letter}%{milestone}%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
-Source0:	https://launchpad.net/heat/%{release_name}/%{version}/+download/heat-%{version}.tar.gz
+Source0:	https://launchpad.net/heat/%{release_name}/%{release_name}-%{milestone}/+download/%{full_release}.tar.gz
 Obsoletes:	heat < 7-9
 Provides:	heat
 
@@ -65,6 +65,7 @@ BuildRequires: python-keystoneclient
 BuildRequires: python-novaclient
 BuildRequires: python-neutronclient
 BuildRequires: python-swiftclient
+BuildRequires: python-heatclient
 %endif
 
 Requires: %{name}-common = %{version}-%{release}
@@ -133,7 +134,6 @@ done < %{SOURCE20}
 
 %install
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
-sed -i -e '/^#!/,1 d' %{buildroot}/%{python_sitelib}/heat/db/sqlalchemy/manage.py
 sed -i -e '/^#!/,1 d' %{buildroot}/%{python_sitelib}/heat/db/sqlalchemy/migrate_repo/manage.py
 mkdir -p %{buildroot}/var/log/heat/
 mkdir -p %{buildroot}/var/run/heat/
@@ -236,6 +236,8 @@ Components common to all OpenStack Heat services
 # Deprecated by openstack-db since openstack-utils-2013.2-2
 %{_mandir}/man1/heat-db-setup.1.gz
 %{_mandir}/man1/heat-keystone-setup.1.gz
+# TODO: enable icehouse-2, https://review.openstack.org/#/c/61212/
+#%{_mandir}/man1/heat-manage.1.gz
 %endif
 
 %pre common
@@ -383,6 +385,10 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Mon Dec 09 2013 Jeff Peeler <jpeeler at redhat.com> 2014-1.0.1.b1
+- update to icehouse-1
+- add python-heatclient to BuildRequires
+
 * Thu Oct 17 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-1
 - update to havana final
 
diff --git a/sources b/sources
index 5780081..b7c8835 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b2320f292b20b14aee293ff7142c80f  heat-2013.2.tar.gz
+8e33e90c716cf2daa20c1fee3c7f1a6a  heat-2014.1.b1.tar.gz