diff options
author | James Cammarata <jimi@sngx.net> | 2014-04-29 21:41:57 +0200 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2014-04-29 21:41:57 +0200 |
commit | 6879415f252f7bb1931934befd6fc6690e1b6424 (patch) | |
tree | 8f07abf226232404fb818c52b8f6295993842ffa /packaging | |
parent | Clarify .ssh/config port usage. (diff) | |
parent | Add Requires to the specfile for setuptools and the python-crypto2.6 (diff) | |
download | ansible-6879415f252f7bb1931934befd6fc6690e1b6424.tar.xz ansible-6879415f252f7bb1931934befd6fc6690e1b6424.zip |
Merge branch 'feature/multi-version-import' of https://github.com/abadger/ansible into abadger-feature/multi-version-import
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/rpm/ansible.spec | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index ae71c119ea..9d667b1a52 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -25,6 +25,12 @@ Requires: python26-paramiko Requires: python26-jinja2 Requires: python26-keyczar Requires: python26-httplib2 +Requires: python26-setuptools +%endif + +# RHEL == 6 +%if 0%{?rhel} == 6 +Requires: python-crypto2.6 %endif # RHEL > 5 @@ -35,6 +41,7 @@ Requires: python-paramiko Requires: python-jinja2 Requires: python-keyczar Requires: python-httplib2 +Requires: python-setuptools %endif # FEDORA > 17 @@ -45,6 +52,7 @@ Requires: python-paramiko Requires: python-jinja2 Requires: python-keyczar Requires: python-httplib2 +Requires: python-setuptools %endif # SuSE/openSuSE @@ -56,6 +64,7 @@ Requires: python-jinja2 Requires: python-keyczar Requires: python-yaml Requires: python-httplib2 +Requires: python-setuptools %endif Requires: sshpass |