[openstack-heat/el6-icehouse] Correct heat_revision for `heat build-info`

[Ryan Brown]

commit 628ec7f1195e5a8ed04b1ec35d7f240c26fa7dde
Author: Ryan S. Brown <sb at ryansb.com>
Date:   Tue Jul 15 12:09:21 2014 -0400

    Correct heat_revision for `heat build-info`
    
    Previously the command `heat build-info` would show "unknown" instead of
    the actual build information e.x. 2014.1.1-2.3.el6
    
    This change puts the contents of %{version}-%{release} into
    /etc/heat/heat.conf so the build-info command runs correctly.
    
    Resolves: rhbz#1110443
    
    Conflicts:
    	openstack-heat.spec

 openstack-heat.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/openstack-heat.spec b/openstack-heat.spec
index afbb90a..0587015 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2014.1.1
-Release:	2.2%{?dist}
+Release:	2.3%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -102,6 +102,7 @@ find contrib -name tests -type d | xargs rm -r
 #  at the end of the file which mimics but also conflicted with our
 #  distro editing that had been done for many releases.
 sed -i '/^[^#[]/{s/^/#/; s/ //g}; /^#[^ ]/s/ = /=/' etc/heat/heat.conf.sample
+sed -i -e "s/^#heat_revision=.*$/heat_revision=%{version}-%{release}/I" etc/heat/heat.conf.sample
 
 #  TODO: Make this more robust
 #  Note it only edits the first occurance, so assumes a section ordering in sample
@@ -391,6 +392,9 @@ fi
 
 
 %changelog
+* Tue Jul 15 2014 Ryan Brown <ryansb at redhat.com> - 2014.1.1-2.3
+- At build time add build+release to /etc/heat/heat.conf
+
 * Wed Jun 25 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1.1-2.2
 - Drop parallel packages properly (rhbz#1112401)