Merge #4689 from dirtyharrycallahan/ansible

Fix ansible.spec to handle opensuse and fedora

packaging/rpm/ansible.spec

@@ -1,42 +1,59 @@
+%define name ansible
+
 %if 0%{?rhel} == 5
 %define __python /usr/bin/python26
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%{!?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
-
-Name: ansible
+Name:      %{name}
+Version:   1.5
 Release:   1%{?dist}
+Url:       http://www.ansibleworks.com
 Summary:   SSH-based configuration management, deployment, and orchestration engine
-Version: 1.5
-
-Group: Development/Libraries
 License:   GPLv3
-Source0: http://www.ansibleworks.com/releases/%{name}-%{version}.tar.gz
-Url: http://www.ansibleworks.com
+Group:     Development/Libraries
+Source:    http://www.ansibleworks.com/releases/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 BuildArch: noarch
+
+# RHEL <=5
 %if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires: python26-devel
-
 Requires: python26-PyYAML
 Requires: python26-paramiko
 Requires: python26-jinja2
 Requires: python26-keyczar
-%else
-%if 0%{?suse_version}
-BuildRequires: python-devel
-%else
+%endif
+
+# RHEL > 5
+%if 0%{?rhel} && 0%{?rhel} > 5
 BuildRequires: python2-devel
+Requires: PyYAML
+Requires: python-paramiko
+Requires: python-jinja2
+Requires: python-keyczar
 %endif
 
+# FEDORA > 17
+%if 0%{?fedora} >= 18
+BuildRequires: python-devel
 Requires: PyYAML
 Requires: python-paramiko
 Requires: python-jinja2
 Requires: python-keyczar
 %endif
+
+# SuSE/openSuSE
+%if 0%{?suse_version} 
+BuildRequires: python-devel
+BuildRequires: python-setuptools
+Requires: python-paramiko
+Requires: python-jinja2
+Requires: python-keyczar
+Requires: python-yaml
+%endif
+
 Requires: sshpass
 
 %description
@@ -54,18 +71,18 @@ are transferred to managed machines automatically.
 %{__python} setup.py build
 
 %install
-%{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/ansible/
-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 -rv library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/
+%{__python} setup.py install -O1 --prefix=%{_prefix} --root=%{buildroot}
+mkdir -p %{buildroot}/etc/ansible/
+cp examples/hosts %{buildroot}/etc/ansible/
+cp examples/ansible.cfg %{buildroot}/etc/ansible/
+mkdir -p %{buildroot}/%{_mandir}/{man1,man3}/
+cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/
+cp -v docs/man/man3/*.3 %{buildroot}/%{_mandir}/man3/
+mkdir -p %{buildroot}/%{_datadir}/ansible
+cp -rv library/* %{buildroot}/%{_datadir}/ansible/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)