Fixup RPM building: Makefile, Spec File, .gitignore

Fixup distutils: setup.py

Clean old cruft: section 5 man pages

1 files changed, 15 insertions, 18 deletions

diff --git a/setup.py b/setup.py
index c70aa34796..c15e8a7831 100644
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,31 @@
 #!/usr/bin/env python
 
+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='1.0',
+      version=__version__,
       description='Minimal SSH command and control',
-      author='Michael DeHaan',
+      author=__author__,
       author_email='michael.dehaan@gmail.com',
-      url='http://github.com/mpdehaan/ansible/',
+      url='http://ansible.github.com/',
       license='GPLv3',
       package_dir = { 'ansible' : 'lib/ansible' },
       packages=[
          'ansible',
       ],
       data_files=[ 
-         ('/usr/share/ansible', [ 
-             'library/ping',
-             'library/command',
-             'library/facter',
-             'library/ohai',
-             'library/copy',
-             'library/setup',
-             'library/service',
-             'library/template',
-             'library/git',
-         ]),
-         ('/usr/share/man/man1', [
-                'docs/man/man1/ansible.1',
-                'docs/man/man1/ansible-playbook.1'
-         ]),
+         ('/usr/share/ansible',
+          glob.glob('library/*')
+          ),
+         ('/usr/share/man/man1',
+          glob.glob('docs/man/man1/*.1')
+          ),
       ],
       scripts=[
          'bin/ansible',