[imagefactory-plugins/f20] rebase with upstream 1.1.5

[Ian McLeod]

commit 4ef768b9ffb38060c57d9af1ae3edf14d592932f
Author: Ian McLeod <imcleod at redhat.com>
Date:   Fri May 30 15:03:57 2014 -0500

    rebase with upstream 1.1.5

 .gitignore                |    1 +
 imagefactory-plugins.spec |   19 ++++++++++++++-----
 sources                   |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8dc0068..321cb19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /imagefactory-1.1.3.tar.gz
 /imagefactory-plugins-1.1.3.tar.gz
 /imagefactory-plugins-1.1.4.tar.gz
+/imagefactory-plugins-1.1.5.tar.gz
diff --git a/imagefactory-plugins.spec b/imagefactory-plugins.spec
index d498801..744e25d 100644
--- a/imagefactory-plugins.spec
+++ b/imagefactory-plugins.spec
@@ -14,13 +14,16 @@ exit 0
 
 Summary: Default plugins for the Image Factory system image generation tool
 Name: imagefactory-plugins
-Version: 1.1.4
-Release: 1%{?dist}
+Version: 1.1.5
+Release: 2%{?dist}
 Source0: http://repos.fedorapeople.org/repos/aeolus/imagefactory/%{version}/tarball/%{name}-%{version}.tar.gz
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.aeolusproject.org/imagefactory.html
 BuildArch: noarch
+%if 0%{?rhel} == 6
+ExcludeArch: i386 ppc64
+%endif
 BuildRequires: python2
 BuildRequires: python-setuptools
 Requires: imagefactory
@@ -58,7 +61,7 @@ archive from.
 %package IndirectionCloud
 Summary: Cloud plugin for allowing images to modify other images
 License: ASL 2.0
-Requires: oz >= 0.7.0
+Requires: oz >= 0.12.0
 Requires: imagefactory-plugins
 Requires: imagefactory-plugin-api = 1.0
 
@@ -72,7 +75,7 @@ arbitrary  host OS and package selection for the actual media creation tools.
 %package TinMan
 Summary: OS plugin for Fedora
 License: ASL 2.0
-Requires: oz >= 0.7.0
+Requires: oz >= 0.12.0
 Requires: imagefactory-plugins
 Requires: imagefactory-plugin-api = 1.0
 
@@ -149,10 +152,10 @@ A plugin for RHEVM "clouds"
 %package vSphere
 Summary: vSphere Cloud plugin
 License: ASL 2.0
-Requires: VMDKstream
 Requires: imagefactory-plugins
 Requires: python-psphere
 Requires: imagefactory-plugin-api = 1.0
+Requires: VMDKstream
 
 %description vSphere
 A plugin for vSphere "clouds"
@@ -321,6 +324,12 @@ rm -rf %{buildroot}%{python_sitelib}/imagefactory_plugins/MockCloud
 %{python_sitelib}/imagefactory_plugins/Docker/*
 
 %changelog
+* Tue May 6 2014 Ian McLeod <imcleod at redhat.com> - 1.1.5-2
+- Rebase with upstream
+- Improved parameters parsing that couples with improved parameters CLI support in core imagefactory
+- Add support for "offline" ICICLE generation in TinMan
+- Rework IndirectionCloud to work with recent Oz releases
+
 * Mon Sep 23 2013 Ian McLeod <imcleod at redhat.com> - 1.1.3-2
 - Add abort() method to TinMan plugin
 
diff --git a/sources b/sources
index 88317c2..ed32b45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1485d67840442896ff0743a29f913f3  imagefactory-plugins-1.1.4.tar.gz
+e8ec21c3a867599b2cd309fddae050ae  imagefactory-plugins-1.1.5.tar.gz