[mcollective] Fix patch 0001 to stop loading verdor directory.

stevetraylen stevetraylen at fedoraproject.org
Fri Apr 27 19:23:14 UTC 2012


commit 06d3028a45353cad5301eee040008fbf8c3c8380
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Fri Apr 27 23:20:22 2012 +0200

    Fix patch 0001 to stop loading verdor directory.

 0001-get-rid-of-vendor-libraries.patch |   14 ++++++--------
 mcollective.spec                       |    5 ++++-
 2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/0001-get-rid-of-vendor-libraries.patch b/0001-get-rid-of-vendor-libraries.patch
index 1c8c816..a3cb921 100644
--- a/0001-get-rid-of-vendor-libraries.patch
+++ b/0001-get-rid-of-vendor-libraries.patch
@@ -1,17 +1,15 @@
-diff --git a/lib/mcollective.rb b/lib/mcollective.rb
-index b8e3041..a9e77b6 100644
---- a/lib/mcollective.rb
-+++ b/lib/mcollective.rb
-@@ -56,7 +56,6 @@ module MCollective
+diff -uNr mcollective-1.3.3.ORIG/lib/mcollective.rb mcollective-1.3.3/lib/mcollective.rb
+--- mcollective-1.3.3.ORIG/lib/mcollective.rb	2012-04-27 23:13:37.750000029 +0200
++++ mcollective-1.3.3/lib/mcollective.rb	2012-04-27 23:13:57.334000029 +0200
+@@ -56,11 +56,9 @@
    autoload :SSL, "mcollective/ssl"
    autoload :Application, "mcollective/application"
    autoload :Applications, "mcollective/applications"
 -  autoload :Vendor, "mcollective/vendor"
    autoload :Shell, "mcollective/shell"
    autoload :PluginPackager, "mcollective/pluginpackager"
-
+ 
 -  MCollective::Vendor.load_vendored
--
+ 
    VERSION="1.3.3"
  
-   def self.version
diff --git a/mcollective.spec b/mcollective.spec
index 470cb07..f5955a5 100644
--- a/mcollective.spec
+++ b/mcollective.spec
@@ -8,7 +8,7 @@
 Summary:   A framework to build server orchestration or parallel job execution systems
 Name:      mcollective
 Version:   1.3.3
-Release:   3%{?dist}
+Release:   4%{?dist}
 Group:     Applications/System
 License:   ASL 2.0
 
@@ -194,6 +194,9 @@ fi
 %dir /etc/mcollective/ssl/clients
 
 %changelog
+* Fri Apr 27 2012 Steve Traylen <steve.traylen at cern.ch> - 1.3.3-4
+- Fix patch 0001 to stop loading verdor directory.
+
 * Tue Apr 24 2012 Steve Traylen <steve.traylen at cern.ch> - 1.3.3-3
 - Fix systemd start up file.
 


More information about the scm-commits mailing list