diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-13 15:37:11 -0700 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-13 15:37:11 -0700 |
| commit | 84c60c27505743d6781470d3469bc53e403cfc0f (patch) | |
| tree | 8b8e41875e89b57e4e304183310c3b8033b5d8d0 | |
| parent | 8df0c92f3c89ff18a9f026f40f119543ea6a9b9e (diff) | |
| parent | 3567237dbc88fdcc11ada0d191bd928bbce80efe (diff) | |
| download | ansible-84c60c27505743d6781470d3469bc53e403cfc0f.tar.gz | |
Merge pull request #91 from skvidal/feature
modify build/spec file to work on el6 with quasi-broken setup process
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | ansible.spec | 4 | ||||
| -rw-r--r-- | setup.py | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 158b1efa93..d02fe3ed95 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include README.md AUTHORS.md ansible.spec include examples/hosts recursive-include docs * +recursive-include library * include Makefile diff --git a/ansible.spec b/ansible.spec index 02137e7d0c..923f3b9505 100644 --- a/ansible.spec +++ b/ansible.spec @@ -35,6 +35,10 @@ make docs python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES mkdir -p $RPM_BUILD_ROOT/etc/ansible/ cp examples/hosts $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 +cp -v library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/ %clean rm -rf $RPM_BUILD_ROOT @@ -19,14 +19,6 @@ setup(name='ansible', packages=[ 'ansible', ], - data_files=[ - ('/usr/share/ansible', - glob.glob('library/*') - ), - ('/usr/share/man/man1', - glob.glob('docs/man/man1/*.1') - ), - ], scripts=[ 'bin/ansible', 'bin/ansible-playbook' |