From 0265d375590b216ede1541b777327e6e8e059fbc Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Feb 13 2014 15:39:21 +0000
Subject: Upstream 2.4.1


---

diff --git a/.gitignore b/.gitignore
index 7a2aa09..f8789ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mcollective-2.0.0.tgz
 /mcollective-2.2.0.tgz
 /mcollective-2.2.3.tgz
+/mcollective-2.4.1.tar.gz
diff --git a/mcollective.spec b/mcollective.spec
index edcf750..9b8a6c6 100644
--- a/mcollective.spec
+++ b/mcollective.spec
@@ -1,31 +1,25 @@
 %if 0%{?el5}%{?el6}%{?fc16}
 %global ruby_vendorlibdir %{_prefix}/lib/ruby/site_ruby/1.8
 %global ruby_version 1.8
-%else
-%global ruby_version 1.9.1
 %endif
 
 Summary:   A framework to build server orchestration or parallel job execution systems
 Name:      mcollective
-Version:   2.2.3
-Release:   2%{?dist}
+Version:   2.4.1
+Release:   1%{?dist}
 Group:     Applications/System
 License:   ASL 2.0
 
 URL:       http://docs.puppetlabs.com/mcollective/
 
-Source0:   http://puppetlabs.com/downloads/mcollective/%{name}-%{version}.tgz
+Source0:   http://puppetlabs.com/downloads/mcollective/%{name}-%{version}.tar.gz
 Source1:   mcollective.service
 
-# An explicit removal of messaging connection
-# https://bugzilla.redhat.com/show_bug.cgi?id=952970
-Patch0:   mcollective-rhbz#952970.patch
-
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ruby-devel
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires: systemd
 %endif
 
@@ -33,7 +27,7 @@ BuildArch: noarch
 
 Requires:  mcollective-common = %{version}-%{release}
 
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -43,7 +37,7 @@ Requires(postun): systemd
 Summary: Common libraries for the mcollective clients and servers
 Group: Applications/System
 Requires: ruby
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 Requires: ruby(release)
 %else
 Requires: ruby(abi) = %{ruby_version}
@@ -70,7 +64,6 @@ or parallel job execution systems.
 
 %prep
 %setup0 -q
-%patch0 -p1
 rm -rf lib/mcollective/vendor/json
 rm -rf lib/mcollective/vendor/systemu
 rm -rf lib/mcollective/vendor/load_*.rb
@@ -174,6 +167,9 @@ fi
 %dir /etc/mcollective/plugin.d
 
 %changelog
+* Wed Feb 12 2014 Steve Traylen <steve.traylen@cern.ch> - 2.4.1-1
+- Upstream 2.4.1
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8fb98bd..38d44f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a40cc0f4cfd8ba5c85df508588d48e5c  mcollective-2.2.3.tgz
+d56596f9b09ce9fd2444da0d276dcd70  mcollective-2.4.1.tar.gz