From 1f0eb328461c0313b1426b5338bc31e0c70febf5 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Fri, 13 Sep 2013 17:31:34 -0400
Subject: [PATCH] Update 1.4 specfile -- no need for node fireball package,
 release dates

---
 lib/ansible/__init__.py    |  2 +-
 packaging/rpm/ansible.spec | 56 ++++++--------------------------------
 2 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 1bd37579228..7ecc8f45784 100644
--- a/lib/ansible/__init__.py
+++ b/lib/ansible/__init__.py
@@ -14,5 +14,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.3'
+__version__ = '1.4'
 __author__ = 'Michael DeHaan'
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 0da31790b99..50721519e66 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Release: 1%{?dist}
 Summary: SSH-based configuration management, deployment, and orchestration engine
-Version: 1.3
+Version: 1.4
 
 Group: Development/Libraries
 License: GPLv3
@@ -24,12 +24,14 @@ BuildRequires: python26-devel
 Requires: python26-PyYAML
 Requires: python26-paramiko
 Requires: python26-jinja2
+Requires: python26-keyczar
 %else
 BuildRequires: python2-devel
 
 Requires: PyYAML
 Requires: python-paramiko
 Requires: python-jinja2
+Requires: python-keyczar
 %endif
 
 %description
@@ -40,41 +42,6 @@ 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}
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Requires: python26-keyczar
-Requires: python26-zmq
-%else
-Requires: python-keyczar
-Requires: python-zmq
-%endif
-
-%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
-%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.
-
 %prep
 %setup -q
 
@@ -101,27 +68,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ansible*
 %dir %{_datadir}/ansible
 %{_datadir}/ansible/*/*
-#%{_datadir}/ansible/*/f[a-hj-z]*
-#%{_datadir}/ansible/*/file
 %config(noreplace) %{_sysconfdir}/ansible
 %doc README.md PKG-INFO COPYING
 %doc %{_mandir}/man1/ansible*
 %doc %{_mandir}/man3/ansible.*
-#%doc %{_mandir}/man3/ansible.f[a-hj-z]*
-#%doc %{_mandir}/man3/ansible.file*
 %doc examples/playbooks
 
-%files fireball
-%{_datadir}/ansible/utilities/fireball
-%doc %{_mandir}/man3/ansible.fireball.*
-
-%files node-fireball
-%doc README.md PKG-INFO COPYING
 
 %changelog
 
-* Fri Jul 05 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.3-0
-* (release pending)
+* Fri Sep 13 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.4-0
+* (PENDING)
+
+* Fri Sep 13 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.3-0
+* Release 1.3.0
 
 * Thu Jul 05 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.2-2
 * Release 1.2.2