[os-apply-config/f20] Remove pbr runtime dependency and fix pystache requires

[Steven Dake]

commit 453b1ac21f750159f32aa9470edefba9c44100b5
Author: Steven Dake <sdake at redhat.com>
Date:   Mon Feb 24 10:15:19 2014 -0700

    Remove pbr runtime dependency and fix pystache requires

 ...runtime-dependency-and-replace-with-build.patch |   37 ++++++++++++++++++++
 os-apply-config.spec                               |    7 +++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch b/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
new file mode 100644
index 0000000..3eb8bbc
--- /dev/null
+++ b/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
@@ -0,0 +1,37 @@
+From 75d163102e5debfed779f95fbe15df21030b73da Mon Sep 17 00:00:00 2001
+From: Steven Dake <sdake at redhat.com>
+Date: Mon, 24 Feb 2014 10:12:02 -0700
+Subject: [PATCH] Remove pbr runtime dependency and replace with build time
+ calculation
+
+Requires some sed operation on REDHATOSAPPLYCONFIGVERSION and
+REDHATOSAPPLYCONFIGRELEASE to runtime modify the package.
+---
+ os_apply_config/version.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/os_apply_config/version.py b/os_apply_config/version.py
+index d4af00b..fc30ea5 100644
+--- a/os_apply_config/version.py
++++ b/os_apply_config/version.py
+@@ -13,6 +13,15 @@
+ #    under the License.
+ 
+ 
+-import pbr.version
++class VersionInfo(object):
++    release = "REDHATOAPPLCONFIGRELEASE"
++    version = "REDHATOSAPPLYCONFIGVERSION"
+ 
+-version_info = pbr.version.VersionInfo('os-apply-config')
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++version_info = VersionInfo()
++version_string = version_info.version_string
+-- 
+1.8.5.3
+
diff --git a/os-apply-config.spec b/os-apply-config.spec
index 0383086..f321a5d 100644
--- a/os-apply-config.spec
+++ b/os-apply-config.spec
@@ -1,6 +1,6 @@
 Name:		os-apply-config
 Version:	0.1.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Configure files from cloud metadata
 
 License:	ASL 2.0
@@ -15,6 +15,7 @@ BuildRequires:	python-pbr
 Requires:	python-setuptools
 Requires:	python-argparse
 Requires:	python-anyjson
+Requires:	pystache
 
 %description
 Tool to apply openstack heat metadata to files on the system.
@@ -37,6 +38,10 @@ Tool to apply openstack heat metadata to files on the system.
 %{python_sitelib}/os_apply_config*
 
 %changelog
+* Mon Feb 24 2014 Steven Dake <sdake at redhat.com> - 0.1.12-3
+- Override python-pbr rquires by manually sedding the release and version
+- Add pystache requires from bodhi testing
+
 * Fri Feb 21 2014 Steven Dake <sdake at redhat.com> - 0.1.12-2
 - Add python-pbr buildrequires