[mcollective] Update to 2.2.0, add plugin.d directory to package, add missing .erb help files.

[stevetraylen]

commit f2919b599fe478d6f169af4749ddbc3e0e17958c
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sat Sep 22 23:05:41 2012 +0200

    Update to 2.2.0, add plugin.d directory to package, add missing .erb help files.

 .gitignore       |    1 +
 mcollective.spec |   14 ++++++++++----
 sources          |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e63a2b..c31dbd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mcollective-1.3.2.tgz
 /mcollective-1.3.3.tgz
 /mcollective-2.0.0.tgz
+/mcollective-2.2.0.tgz
diff --git a/mcollective.spec b/mcollective.spec
index 40828f1..be06901 100644
--- a/mcollective.spec
+++ b/mcollective.spec
@@ -7,8 +7,8 @@
 
 Summary:   A framework to build server orchestration or parallel job execution systems
 Name:      mcollective
-Version:   2.0.0
-Release:   6%{?dist}
+Version:   2.2.0
+Release:   1%{?dist}
 Group:     Applications/System
 License:   ASL 2.0
 
@@ -100,10 +100,11 @@ cp --preserve=timestamps --recursive plugins/* %{buildroot}%{_libexecdir}/mcolle
 %{__install} -d -m0755  %{buildroot}/etc/mcollective
 %{__install} -d -m0755  %{buildroot}/etc/mcollective/ssl
 %{__install} -d -m0755  %{buildroot}/etc/mcollective/ssl/clients
+%{__install} -d -m0755  %{buildroot}/etc/mcollective/plugin.d/clients
 %{__install} -p -m0640 etc/server.cfg.dist %{buildroot}/etc/mcollective/server.cfg
 %{__install} -p -m0644 etc/client.cfg.dist %{buildroot}/etc/mcollective/client.cfg
 %{__install} -p -m0644 etc/facts.yaml.dist %{buildroot}/etc/mcollective/facts.yaml
-%{__install} -p -m0644 etc/rpc-help.erb %{buildroot}/etc/mcollective/rpc-help.erb
+%{__install} -p -m0644 etc/*.erb %{buildroot}/etc/mcollective/
 
 %clean
 rm -rf %{buildroot}
@@ -168,12 +169,12 @@ fi
 %{_libexecdir}/mcollective
 %dir %{_sysconfdir}/mcollective
 %dir %{_sysconfdir}/mcollective/ssl
+%config(noreplace) %{_sysconfdir}/mcollective/*.erb
 
 %files client
 %defattr(-,root,root,-)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/mcollective/client.cfg
-%config(noreplace) %{_sysconfdir}/mcollective/rpc-help.erb
 %{_sbindir}/mco
 
 %files
@@ -189,8 +190,13 @@ fi
 %{_unitdir}/mcollective.service
 %endif
 %dir /etc/mcollective/ssl/clients
+%dir /etc/mcollective/plugin.d
 
 %changelog
+* Sat Sep 22 2012 Steve Traylen <steve.traylen at cern.ch> - 2.2.0-1
+- Update to 2.2.0, add plugin.d directory to package, add missing
+  .erb help files.
+
 * Wed Sep 5 2012 Steve Traylen <steve.traylen at cern.ch> - 2.0.0-6
 - Fix rhbz#853574 in different way. 0644 client.cfg.
 
diff --git a/sources b/sources
index 50e8a1a..1c35f2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65ef7e831e649d4b86818517196a9270  mcollective-2.0.0.tgz
+66cb938a3ea3522b47f8c0e96a2f4819  mcollective-2.2.0.tgz