- up to 2.4.3.0; fireball is obsolete; untested

diff --git a/ansible.spec b/ansible.spec
index 1b6bee11f0dbe9396b6c8e73819fe901d59b4ec2..c25ce3636753b725faa16b573b3c02e8d005c024 100644 (file)
--- a/ansible.spec
+++ b/ansible.spec
@@ -1,11 +1,12 @@
+%define                subver  1
 Summary:       SSH-based configuration management, deployment, and task execution system
 Name:          ansible
-Version:       1.3.1
+Version:       2.4.3.0
 Release:       0.1
 License:       GPL v3+
 Group:         Development/Libraries
-Source0:       https://github.com/ansible/ansible/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 15b72c9f0d9c0d01c90c4e431a3fe3ae
+Source0:       https://github.com/ansible/ansible/archive/v%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: aabc916a200bc5ad4ecbc29b2685ac87
 Patch0:                https://github.com/glensc/ansible/compare/pm-poldek.patch
 # Patch0-md5:  91dd49cb9c64c52615aec95341c40128
 Patch1:                https://github.com/glensc/ansible/compare/rc.d-systemd.patch
@@ -31,36 +32,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.
 
-%package fireball
-Summary:       Ansible fireball transport support
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      python-keyczar
-Requires:      python-zmq
-
-%description fireball
-Ansible can optionally use a 0MQ based transport mechanism, which is
-considerably faster than the standard ssh mechanism when there are
-multiple actions, but requires additional supporting packages.
-
-%package node-fireball
-Summary:       Ansible fireball transport - node end support
-Group:         Development/Libraries
-Requires:      python-keyczar
-Requires:      python-zmq
-
-%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.
-
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{subver}
 %patch0 -p1
 
 %build
 %py_build
-%{__make} modulepages
+%{__make} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,11 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 
 #py_postclean
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name},%{_mandir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_mandir}}
 sed -re '/^#/ !s,[^#]+$,#&,' examples/hosts > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts
 cp -p examples/ansible.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 cp -a docs/man/* $RPM_BUILD_ROOT%{_mandir}
-cp -a library/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/*.asciidoc.in
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/.gitdir
@@ -90,21 +67,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ansible-doc
 %attr(755,root,root) %{_bindir}/ansible-playbook
 %attr(755,root,root) %{_bindir}/ansible-pull
+%{_bindir}/ansible-config
+%{_bindir}/ansible-connection
+%{_bindir}/ansible-console
+%{_bindir}/ansible-galaxy
+%{_bindir}/ansible-inventory
+%{_bindir}/ansible-vault
+%{_mandir}/man1/ansible-config.1*
+%{_mandir}/man1/ansible-console.1*
+%{_mandir}/man1/ansible-galaxy.1*
+%{_mandir}/man1/ansible-inventory.1*
+%{_mandir}/man1/ansible-vault.1*
 %{_mandir}/man1/ansible.1*
 %{_mandir}/man1/ansible-doc.1*
 %{_mandir}/man1/ansible-playbook.1*
 %{_mandir}/man1/ansible-pull.1*
-%{_mandir}/man3/ansible.*.3*
-%exclude %{_mandir}/man3/ansible.fireball.3*
-%{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/utilities/fireball
 %{py_sitescriptdir}/ansible
 %{py_sitescriptdir}/ansible-%{version}-*.egg-info
-
-%files fireball
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/utilities/fireball
-%{_mandir}/man3/ansible.fireball.3*
-
-%files node-fireball
-%defattr(644,root,root,755)