From fee0e897667141e3f52ecd613c4aae5eacf37594 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Sep 07 2012 15:25:49 +0000
Subject: Merge branch 'f16' into f17


---

diff --git a/.gitignore b/.gitignore
index 36d7d2e..99b7eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ansible-0.4.1.tar.gz
 /ansible-0.5.1.tar.gz
 /ansible-0.6.tar.gz
+/ansible-0.7.tar.gz
diff --git a/ansible.spec b/ansible.spec
index 883b7c7..5706929 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -4,9 +4,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %endif
 
 Name: ansible
-Release: 1%{?dist}
-Summary: Minimal SSH command and control
-Version: 0.6
+Release: 0.git201209061851%{?dist}
+Summary: SSH-based configuration management, deployment, and task execution system
+Version: 0.7
 
 Group: Development/Libraries
 License: GPLv3
@@ -39,6 +39,7 @@ are transferred to managed machines automatically.
 %{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/ansible/
 cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/
+cp examples/ansible.cfg $RPM_BUILD_ROOT/etc/ansible/
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
 cp -v docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ansible
@@ -55,9 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ansible
 %doc README.md PKG-INFO COPYING
 %doc %{_mandir}/man1/ansible*
-
+%doc examples/playbooks
 
 %changelog
+* Thu Aug 6 2012 Michael DeHaan <michael.dehaan@gmail.com> - 0.7-0
+- Release of 0.7
+
 * Mon Aug 6 2012 Michael DeHaan <michael.dehaan@gmail.com> - 0.6-0
 - Release of 0.6
 
diff --git a/sources b/sources
index 9e7bf4d..03bb649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f699c07c188b0d056cc20df38ca67daa  ansible-0.6.tar.gz
+b6d0db17e59d7ed95fdb967f752f29b3  ansible-0.7.tar.gz