From a379e7ed72d9e74675b71f5a18dadb8cafaf33ab Mon Sep 17 00:00:00 2001 From: Ivan Lezhnjov IV Date: Fri, 12 Apr 2013 13:14:03 -0700 Subject: [PATCH] Updated ansible.spec should now work for CentOS 5 and CentOS 6 Signed-off-by: Ivan Lezhnjov IV --- packaging/rpm/ansible.spec | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index ccc67d3be2..6b1419cc7e 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -1,4 +1,5 @@ -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if 0%{?rhel} <= 5 +%define __python /usr/bin/python26 %{!?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 @@ -6,15 +7,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Release: 1%{?dist} Summary: SSH-based configuration management, deployment, and task execution system -Version: 1.1 +Version: 1.2rc Group: Development/Libraries License: GPLv3 -Source0: https://github.com/downloads/ansible/ansible/%{name}-%{version}.tar.gz +Source0: https://github.com/downloads/ansible/ansible/%{name}-%{version}.tar.bz2 Url: http://ansible.github.com BuildArch: noarch -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if 0%{?rhel} <= 5 BuildRequires: python26-devel Requires: python26-PyYAML @@ -36,17 +37,13 @@ over SSH and does not require any software or daemons to be installed on remote nodes. Extension modules can be written in any language and are transferred to managed machines automatically. +%if 0%{?rhel} >= 6 %package fireball Summary: Ansible fireball transport support Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%if 0%{?rhel} && 0%{?rhel} <= 5 -Requires: python26-keyczar -Requires: python26-zmq -%else Requires: python-keyczar Requires: python-zmq -%endif %description fireball @@ -57,19 +54,15 @@ multiple actions, but requires additional supporting packages. %package node-fireball Summary: Ansible fireball transport - node end support Group: Development/Libraries -%if 0%{?rhel} && 0%{?rhel} <= 5 -Requires: python26-keyczar -Requires: python26-zmq -%else Requires: python-keyczar Requires: python-zmq -%endif %description node-fireball Ansible can optionally use a 0MQ based transport mechanism, which has additional requirements for nodes to use. This package includes those requirements. +%endif %prep %setup -q @@ -84,7 +77,6 @@ cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/ cp examples/ansible.cfg $RPM_BUILD_ROOT/etc/ansible/ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man1,man3}/ cp -v docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ -cp -v docs/man/man3/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ansible cp -v library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/ @@ -100,19 +92,21 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ansible/f[a-hj-z]* %{_datadir}/ansible/file %config(noreplace) %{_sysconfdir}/ansible -%doc README.md PKG-INFO COPYING +%doc README.md COPYING %doc %{_mandir}/man1/ansible* -%doc %{_mandir}/man3/ansible.[a-eg-z]* -%doc %{_mandir}/man3/ansible.f[a-hj-z]* -%doc %{_mandir}/man3/ansible.file* %doc examples/playbooks +%if 0%{?rhel} <= 5 +%exclude %{_datadir}/ansible/fireball +%endif + +%if 0%{?rhel} >= 6 %files fireball %{_datadir}/ansible/fireball -%doc %{_mandir}/man3/ansible.fireball.* %files node-fireball -%doc README.md PKG-INFO COPYING +%doc README.md COPYING +%endif %changelog