Move setup.py stuff back to top level as "make sdist" was not working, plus, it makes sources cleaner.

packaging/distutils/MANIFEST.in

@@ -1,6 +0,0 @@
-include README.md packaging/rpm/ansible.spec
-include examples/hosts
-include packaging/distutils/setup.py
-recursive-include docs *
-recursive-include library *
-include Makefile

packaging/distutils/setup.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-# NOTE: setup.py does NOT install the contents of the library dir
-# for you, you should go through "make install" or "make RPMs" 
-# for that, or manually copy modules over.
-
-import glob
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('lib'))
-from ansible import __version__, __author__
-from distutils.core import setup
-
-setup(name='ansible',
-      version=__version__,
-      description='Minimal SSH command and control',
-      author=__author__,
-      author_email='michael.dehaan@gmail.com',
-      url='http://ansible.github.com/',
-      license='GPLv3',
-      package_dir = { 'ansible' : 'lib/ansible' },
-      packages=[
-         'ansible',
-      ],
-      scripts=[
-         'bin/ansible',
-         'bin/ansible-playbook'
-      ]
-)

packaging/rpm/ansible.spec

@@ -2,8 +2,6 @@
 %{!?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
-%define _dusetup   packaging/distutils/setup.py
-
 
 Name: ansible
 Release: 1%{?dist}
@@ -35,10 +33,10 @@ are transferred to managed machines automatically.
 %setup -q
 
 %build
-%{__python} %{_dusetup} build
+%{__python} setup.py build
 
 %install
-%{__python} %{_dusetup} install -O1 --root=$RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/ansible/
 cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/