[imagefactory-plugins] Import upstream 1.1.6

[Ian McLeod]

commit c46b75e8c59b87360a6da6ec84ebbac622d9be90
Author: Ian McLeod <imcleod at redhat.com>
Date:   Tue Oct 21 16:21:21 2014 -0500

    Import upstream 1.1.6

 .gitignore                |    1 +
 imagefactory-plugins.spec |   47 ++++++++++++++++++++++++++++++++++++++------
 sources                   |    2 +-
 3 files changed, 42 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80556fd..7d6e64a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /imagefactory-plugins-1.1.3.tar.gz
 /imagefactory-plugins-1.1.4.tar.gz
+/imagefactory-plugins-1.1.6.tar.gz
diff --git a/imagefactory-plugins.spec b/imagefactory-plugins.spec
index 4d4077e..93227cb 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: 2%{?dist}
+Version: 1.1.6
+Release: 1%{?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"
@@ -161,6 +164,7 @@ A plugin for vSphere "clouds"
 Summary: Cloud plugin for Rackspace
 License: ASL 2.0
 Requires: python-novaclient
+Requires: python-pyrax
 Requires: imagefactory-plugins
 Requires: imagefactory-plugin-api = 1.0
 
@@ -182,6 +186,17 @@ License: ASL 2.0
 %description Docker
 A Cloud plugin to support Docker
 
+%package Nova
+Summary: OS plugin that allows imagefactory to use Nova instances to build base images.
+License: ASL 2.0
+Requires: python-novaclient
+Requires: oz >= 0.12.0
+Requires: imagefactory-plugins
+Requires: imagefactory-plugin-api = 1.0
+
+%description Nova
+An alternative to the TinMan plugin for creating base images using an OpenStack cloud.
+
 %prep
 %setup -q
 
@@ -255,6 +270,11 @@ rm -rf %{buildroot}%{python_sitelib}/imagefactory_plugins/MockCloud
 %postun Docker
 %auto_register_macro_postun Docker
 
+%post Nova
+%auto_register_macro_post Nova
+%postun Nova
+%auto_register_macro_postrun Nova
+
 %files
 %doc COPYING
 %dir %{python_sitelib}/imagefactory_plugins
@@ -320,9 +340,22 @@ rm -rf %{buildroot}%{python_sitelib}/imagefactory_plugins/MockCloud
 %dir %{python_sitelib}/imagefactory_plugins/Docker
 %{python_sitelib}/imagefactory_plugins/Docker/*
 
+%files Nova
+%dir %{python_sitelib}/imagefactory_plugins/Nova
+%{python_sitelib}/imagefactory_plugins/Nova/*
+
 %changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Tue Oct 21 2014 Ian McLeod <imcleod at redhat.com> - 1.1.6-1
+- Upstream 1.1.6 release
+
+* Wed Jul 9 2014 Steve Loranz <sloranz at redhat.com> - 1.1.6
+- Add Nova plugin
+
+* 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..19ccf6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1485d67840442896ff0743a29f913f3  imagefactory-plugins-1.1.4.tar.gz
+77904d1423d94acddac5720eca02f85e  imagefactory-plugins-1.1.6.tar.gz