deleted file mode 100644

@@ -1,5 +0,0 @@

-include README.md packaging/rpm/ansible.spec

-include examples/hosts

-recursive-include docs *

-recursive-include library *

-include Makefile

@@ -16,6 +16,11 @@ RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < $(RPMSPEC) | cut -d "%"

 RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1)

 RPMDIST = $(shell rpm --eval '%dist')

 RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)"

+# Python distutils options

+DUDIR = packaging/distutils

+DUSETUP = $(DUDIR)/setup.py

+DUMANIFEST = $(DUDIR)/MANIFEST.in

+

 all: clean python

@@ -65,15 +70,15 @@ clean:

 	rm -rf MANIFEST rpm-build

 python:

-	python setup.py build

+	python $(DUSETUP) build

 install:

 	mkdir -p /usr/share/ansible

 	cp ./library/* /usr/share/ansible/

-	python setup.py install

+	python $(DUSETUP) install

 sdist: clean

-	python ./setup.py sdist

+	python ./$(DUSETUP) sdist -t $(DUMANIFEST)

 rpmcommon: sdist

 	@mkdir -p rpm-build

new file mode 100644

@@ -0,0 +1,6 @@

+include README.md packaging/rpm/ansible.spec

+include examples/hosts

+include packaging/distutils/setup.py

+recursive-include docs *

+recursive-include library *

+include Makefile

new file mode 100644

@@ -0,0 +1,30 @@

+#!/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'

+      ]

+)

@@ -2,6 +2,8 @@

 %{!?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}

@@ -33,10 +35,10 @@ are transferred to managed machines automatically.

 %setup -q

 %build

-%{__python} setup.py build

+%{__python} %{_dusetup} build

 %install

-%{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT

+%{__python} %{_dusetup} 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/

deleted file mode 100644

@@ -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'

-      ]

-)