Merge pull request #286 from tbielawa/PkgReviewRetagFixes

Pkg review retag fixes

MANIFEST.in

-include README.md packaging/rpm/ansible.spec
+include README.md packaging/rpm/ansible.spec COPYING
 include examples/hosts
 include packaging/distutils/setup.py
 recursive-include docs *

VERSION

-0.3
+0.3.1

docs/man/man1/ansible-playbook.1

@@ -2,12 +2,12 @@
 .\"     Title: ansible-playbook
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 04/17/2012
+.\"      Date: 05/01/2012
 .\"    Manual: System administration commands
-.\"    Source: Ansible 0.0.2
+.\"    Source: Ansible 0.3.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PLAYBOOK" "1" "04/17/2012" "Ansible 0\&.0\&.2" "System administration commands"
+.TH "ANSIBLE\-PLAYBOOK" "1" "05/01/2012" "Ansible 0\&.3\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,10 +42,11 @@ ansible\-playbook <filename\&.yml> \&... [options]
 The names of one or more YAML format files to run as ansible playbooks\&.
 .RE
 .SH "OPTIONS"
-.sp
+.PP
 \fB\-D\fR, \fB\-\-debug\fR
-.sp
+.RS 4
 Print any messages the remote module sends to standard error to the console
+.RE
 .PP
 \fB\-i\fR \fIPATH\fR, \fB\-\-inventory=\fR\fIPATH\fR
 .RS 4

docs/man/man1/ansible-playbook.1.asciidoc.in

@@ -34,7 +34,7 @@ The names of one or more YAML format files to run as ansible playbooks.
 OPTIONS
 -------
 
-*-D*, *--debug*          
+*-D*, *--debug*::
 
 Print any messages the remote module sends to standard error to the console
 

docs/man/man1/ansible.1

@@ -2,12 +2,12 @@
 .\"     Title: ansible
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 04/17/2012
+.\"      Date: 05/01/2012
 .\"    Manual: System administration commands
-.\"    Source: Ansible 0.0.2
+.\"    Source: Ansible 0.3.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "04/17/2012" "Ansible 0\&.0\&.2" "System administration commands"
+.TH "ANSIBLE" "1" "05/01/2012" "Ansible 0\&.3\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

lib/ansible/__init__.py

@@ -14,5 +14,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '0.3'
+__version__ = '0.3.1'
 __author__ = 'Michael DeHaan'

packaging/rpm/ansible.spec

-%if 0%{?rhel} <= 5
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%endif
-
 Name: ansible
 Release: 1%{?dist}
 Summary: Minimal SSH command and control
-Version: 0.3
+Version: 0.3.1
 
 Group: Development/Libraries
-License: GPLv3
+License: GPLv3+
 Source0: https://github.com/downloads/ansible/ansible/%{name}-%{version}.tar.gz
 Url: http://ansible.github.com
 
@@ -21,14 +16,12 @@ Requires: python-paramiko
 Requires: python-jinja2
 
 %description
-
 Ansible is a radically simple model-driven configuration management,
 multi-node deployment, and remote task execution system. Ansible works
 over SSH and does not require any software or daemons to be installed
 on remote nodes. Extension modules can be written in any language and
 are transferred to managed machines automatically.
 
-
 %prep
 %setup -q
 
@@ -44,21 +37,19 @@ cp -v docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ansible
 cp -v library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root)
 %{python_sitelib}/ansible*
 %{_bindir}/ansible*
 %{_datadir}/ansible
 %config(noreplace) %{_sysconfdir}/ansible
-%doc README.md PKG-INFO
+%doc README.md PKG-INFO COPYING
 %doc %{_mandir}/man1/ansible*
 
-
 %changelog
-* Mon Apr 23 2012 Michael DeHaan <mdehaan@redhat.com> - 0.3-1
+* Tue May  1 2012 Tim Bielawa <tbielawa@redhat.com> - 0.3.1-1
+- Release of 0.3.1. Mostly packaging related changes.
+
+* Mon Apr 23 2012 Michael DeHaan <michael.dehaan@gmail.com> - 0.3-1
 - Release of 0.3
 
 * Tue Apr  3 2012 John Eckersberg <jeckersb@redhat.com> - 0.0.2-1

setup.py

@@ -17,7 +17,7 @@ setup(name='ansible',
       author=__author__,
       author_email='michael.dehaan@gmail.com',
       url='http://ansible.github.com/',
-      license='GPLv3',
+      license='GPLv3+',
       install_requires=['paramiko', 'jinja2', "PyYAML"],
       package_dir={ 'ansible': 'lib/ansible' },
       packages=[