From 33f14692d171ff46eb35ba91716062798dab71e8 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Oct 22 2013 21:29:15 +0000
Subject: Rebase to 1.2.6


---

diff --git a/.gitignore b/.gitignore
index 2a650d7..1ddee1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /heat-cfntools-1.2.1.tar.gz
 /heat-cfntools-1.2.3.tar.gz
+/heat-cfntools-1.2.6.tar.gz
diff --git a/heat-cfntools.spec b/heat-cfntools.spec
index 943a8cc..7ee7dc5 100644
--- a/heat-cfntools.spec
+++ b/heat-cfntools.spec
@@ -1,6 +1,6 @@
 Name: heat-cfntools
-Version: 1.2.3
-Release: 2%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 Summary: Tools required to be installed on Heat provisioned cloud instances
 Group: System Environment/Base
 License: ASL 2.0
@@ -11,8 +11,9 @@ BuildArch: noarch
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 
-Requires: python-boto >= 2.4.0
+Requires: python-boto >= 2.5.2
 Requires: python-psutil
+Requires: python-pbr >= 0.5.20
 
 %description
 Tools required to be installed on Heat provisioned cloud instances
@@ -27,11 +28,18 @@ Tools required to be installed on Heat provisioned cloud instances
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
 %files
-%doc README.rst LICENSE
+%doc README.rst LICENSE CONTRIBUTING.rst AUTHORS ChangeLog
 %{_bindir}/cfn-*
 %{python_sitelib}/heat_cfntools*
 
 %changelog
+* Tue Oct 22 2013 Jeff Peeler <jpeeler@redhat.com> 1.2.6-1
+- rebase to 1.2.6
+- added new doc files
+- bump boto version requirement
+- add python-pbr require
+- fixed previous changelog date
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -45,5 +53,5 @@ Tools required to be installed on Heat provisioned cloud instances
 - Added psutil requires
 - Changed install location from /opt to /bin
 
-* Thu Dec 24 2012 Steve Baker <sbaker@redhat.com> 1.0-1
+* Mon Dec 24 2012 Steve Baker <sbaker@redhat.com> 1.0-1
 - initial fork of heat-jeos
diff --git a/sources b/sources
index 0323407..dfaab24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e27aa3e109ec7c38e366e5d7c28f22f8  heat-cfntools-1.2.3.tar.gz
+db19fcae40b8f9de6ec8251bdb50ac3c  heat-cfntools-1.2.6.tar.gz