[openstack-heat/el6-havana] fix the python-oslo-config dependency to cater for epoch add api-paste-dist.ini to /usr/share/heat

[Jeff Peeler]

commit e724926958790cdd9c0b99a441c075f1eb27c19e
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Thu Sep 19 12:07:25 2013 -0400

    fix the python-oslo-config dependency to cater for epoch
    add api-paste-dist.ini to /usr/share/heat

 heat-dist.conf      |    1 +
 openstack-heat.spec |   21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/heat-dist.conf b/heat-dist.conf
index 9d0af06..e2f22d9 100644
--- a/heat-dist.conf
+++ b/heat-dist.conf
@@ -22,6 +22,7 @@ signing_dir = /tmp/keystone-signing-heat
 [database]
 
 [paste_deploy]
+api_paste_config = /usr/share/heat/api-paste-dist.ini
 
 [rpc_notifier2]
 
diff --git a/openstack-heat.spec b/openstack-heat.spec
index c02f041..6a3b9aa 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2013.2
-Release:	0.7.%{release_letter}%{milestone}%{?dist}
+Release:	0.8.%{release_letter}%{milestone}%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -21,8 +21,7 @@ Source2:	openstack-heat-api.init
 Source3:	openstack-heat-api-cfn.init
 Source4:	openstack-heat-engine.init
 Source5:	openstack-heat-api-cloudwatch.init
-# must stay as #6 for conf updating in prep
-Source6:    heat-dist.conf
+Source20:   heat-dist.conf
 
 Patch0: switch-to-using-m2crypto.patch
 Patch1: remove-pbr-runtime-dependency.patch
@@ -125,7 +124,7 @@ echo '
 while read name eq value; do
   test "$name" && test "$value" || continue
   sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/heat/heat.conf.sample
-done < %{SOURCE6}
+done < %{SOURCE20}
 
 %build
 %{__python} setup.py build
@@ -161,8 +160,8 @@ rm -f %{buildroot}/usr/bin/cinder-keystone-setup
 rm -rf %{buildroot}/%{python_sitelib}/heat/tests
 
 install -p -D -m 640 %{_builddir}/%{full_release}/etc/heat/heat.conf.sample %{buildroot}/%{_sysconfdir}/heat/heat.conf
-install -p -D -m 640 %{SOURCE6} %{buildroot}%{_datadir}/heat/heat-dist.conf
-install -p -D -m 640 %{_builddir}/%{full_release}/etc/heat/api-paste.ini %{buildroot}/%{_sysconfdir}/heat
+install -p -D -m 640 %{SOURCE20} %{buildroot}%{_datadir}/heat/heat-dist.conf
+install -p -D -m 640 %{_builddir}/%{full_release}/etc/heat/api-paste.ini %{buildroot}/%{_datadir}/heat/api-paste-dist.ini
 install -p -D -m 640 etc/heat/policy.json %{buildroot}/%{_sysconfdir}/heat
 
 # TODO: move this to setup.cfg
@@ -189,7 +188,7 @@ Requires: python-cinderclient
 Requires: python-keystoneclient >= 0.3.1
 Requires: python-memcached
 Requires: python-novaclient
-Requires: python-oslo-config >= 1.2
+Requires: python-oslo-config >= 1:1.2.0
 Requires: python-neutronclient
 Requires: python-swiftclient
 Requires: python-migrate
@@ -220,6 +219,7 @@ Components common to all OpenStack Heat services
 %{_bindir}/heat-keystone-setup
 %{python_sitelib}/heat*
 %attr(-, root, heat) %{_datadir}/heat/heat-dist.conf
+%attr(-, root, heat) %{_datadir}/heat/api-paste-dist.ini
 %dir %attr(0755,heat,root) %{_localstatedir}/log/heat
 %dir %attr(0755,heat,root) %{_localstatedir}/run/heat
 %dir %attr(0755,heat,root) %{_sharedstatedir}/heat
@@ -227,7 +227,6 @@ Components common to all OpenStack Heat services
 %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-heat
 %config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/heat.conf
 %config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/policy.json
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/api-paste.ini
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/environment.d/*
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/templates/*
 %{_mandir}/man1/heat-db-setup.1.gz
@@ -382,7 +381,11 @@ fi
 
 
 %changelog
-* Tue Sep 17 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.7.b3
+* Thu Sep 19 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.8.b3
+- fix the python-oslo-config dependency to cater for epoch
+- add api-paste-dist.ini to /usr/share/heat
+
+*  Tue Sep 17 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.7.b3
 - Depend on python-oslo-config >= 1.2 so it upgraded automatically
 - Distribute dist defaults in heat-dist.conf separate to user heat.conf (rhbz 1008560)