[heat] Fix some permissions and update Fedora patch

[Jeff Peeler]

commit c40d5a69702ca56af90d7b6effd756ecef740024
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Fri Sep 21 16:12:23 2012 -0400

    Fix some permissions and update Fedora patch
    
    Upstream db11ba2a0cd68be4487b3a58221aae725f8878e2
    
    Signed-off-by: Jeff Peeler <jpeeler at redhat.com>
    
    Conflicts:
    	heat.spec
    
    Signed-off-by: Jeff Peeler <jpeeler at redhat.com>

 heat.spec                      |   27 ++++++++++++++++-----------
 switch-to-using-m2crypto.patch |    2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/heat.spec b/heat.spec
index 8d55c7b..1906f99 100644
--- a/heat.spec
+++ b/heat.spec
@@ -1,7 +1,7 @@
 Name: heat
 Summary: This software provides AWS CloudFormation functionality for OpenStack Essex
 Version: 6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Base
 URL: http://heat-api.org
@@ -36,6 +36,7 @@ Requires: python-routes
 Requires: pysendfile
 Requires: python-sqlalchemy
 Requires: python-webob
+Requires: m2crypto
 
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -87,20 +88,20 @@ Heat provides AWS CloudFormation and CloudWatch functionality for OpenStack.
 %{_mandir}/man1/*.gz
 %{_bindir}/*
 %{python_sitelib}/heat*
-%dir %attr(0755,heat,root) %{_localstatedir}/log/heat
-%dir %attr(0755,heat,root) %{_localstatedir}/lib/heat
+%dir %attr(0755,openstack-heat,root) %{_localstatedir}/log/heat
+%dir %attr(0755,openstack-heat,root) %{_localstatedir}/lib/heat
 %{_unitdir}/heat*.service
 %dir %{_sysconfdir}/heat
 %config(noreplace) %{_sysconfdir}/logrotate.d/heat
 %config(noreplace) %{_sysconfdir}/bash_completion.d/heat
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cfn.conf
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cfn-paste.ini
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cloudwatch.conf
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cloudwatch-paste.ini
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-engine.conf
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-metadata.conf
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-metadata-paste.ini
-%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/boto.cfg
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cfn.conf
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cfn-paste.ini
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cloudwatch.conf
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cloudwatch-paste.ini
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-engine.conf
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-metadata.conf
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-metadata-paste.ini
+%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/boto.cfg
 
 %pre
 getent group openstack-heat >/dev/null || groupadd -r openstack-heat --gid 187
@@ -128,6 +129,10 @@ exit 0
 %systemd_postun_with_restart heat-api-cloudwatch.service
 
 %changelog
+* Fri Sep 21 2012 Jeff Peeler <jpeeler at redhat.com> 6-2
+- update m2crypto patch (Fedora)
+- fix user/group install permissions
+
 * Tue Sep 18 2012 Steven Dake <sdake at redhat.com> 6-1
 - update to new v6 binary names in heat
 
diff --git a/switch-to-using-m2crypto.patch b/switch-to-using-m2crypto.patch
index de1bb47..b83d61a 100644
--- a/switch-to-using-m2crypto.patch
+++ b/switch-to-using-m2crypto.patch
@@ -58,7 +58,7 @@ index a4be7ef..5d16f84 100644
 +    return cipher.update(auth[16:]) + cipher.final()
  
  
- def authenticate(con, service_type='heat', service_name='heat'):
+ def authenticate(con, service_type='orchestration', service_name='heat'):
 diff --git a/tools/pip-requires b/tools/pip-requires
 index 1fcfdf3..4efd475 100644
 --- a/tools/pip-requires