[os-collect-config] Remove runtime dependency on pbr

[Steven Dake]

commit 428b98e633de04c1e8bc5628eb13216110666c00
Author: Steven Dake <sdake at redhat.com>
Date:   Mon Feb 24 09:39:15 2014 -0700

    Remove runtime dependency on pbr

 ...runtime-dependency-and-replace-with-build.patch |   37 ++++++++++++++++++++
 os-collect-config.spec                             |   11 ++++++
 2 files changed, 48 insertions(+), 0 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..da0ec8f
--- /dev/null
+++ b/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
@@ -0,0 +1,37 @@
+From 18ea7c8dbc01590a1457b3d8470d056efd0fc359 Mon Sep 17 00:00:00 2001
+From: Steven Dake <sdake at redhat.com>
+Date: Mon, 24 Feb 2014 09:33:40 -0700
+Subject: [PATCH] Remove pbr runtime dependency and replace with build time
+ calculation
+
+Requires some sed operation on REDHATOSCOLLECTCONFIGVERSION and
+REDHATOSCOLLECTCONFIGRELEASE to runtime modify the package.
+---
+ os_collect_config/version.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/os_collect_config/version.py b/os_collect_config/version.py
+index d8aec69..62a55ff 100644
+--- a/os_collect_config/version.py
++++ b/os_collect_config/version.py
+@@ -13,6 +13,15 @@
+ #    under the License.
+ 
+ 
+-import pbr.version
++class VersionInfo(object):
++    release = "REDHATOSCOLLECTCONFIGRELEASE"
++    version = "REDHATOSCOLLECTCONFIGVERSION"
+ 
+-version_info = pbr.version.VersionInfo('os-collect-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-collect-config.spec b/os-collect-config.spec
index 074d98b..a6a3706 100644
--- a/os-collect-config.spec
+++ b/os-collect-config.spec
@@ -8,6 +8,8 @@ URL:			http://pypi.python.org/pypi/%{name}
 Source0:		http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 Source1:		os-collect-config.service
 
+Patch0001: 0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
+
 BuildArch:		noarch
 BuildRequires:		python-setuptools
 BuildRequires:		python2-devel
@@ -35,6 +37,12 @@ Service to collect openstack heat metadata.
 
 %setup -q -n %{name}-%{version}
 
+%patch0001 -p1
+
+sed -i '/setuptools_git/d' setup.py
+sed -i s/REDHATOSCOLLECTCONFIGVERSION/%{version}/ os_collect_config/version.py
+sed -i s/REDHATOSCOLLECTCONFIGRELEASE/%{release}/ os_collect_config/version.py
+
 %build
 %{__python} setup.py build
 
@@ -59,6 +67,9 @@ install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/os-collect-config.servic
 %{_unitdir}/os-collect-config.service
 
 %changelog
+* Mon Feb 24 2014 Steven Dake <sdake at redhat.com> - 0.1.11-4
+- Make runtime version calculation instead of using python-pbr
+
 * Thu Feb 20 2014 Steven Dake <sdake at redhat.com> - 0.1.11-3
 - Added missing dependency python-anyjson
 - Added missing build requires python-pbr