[imagefactory-plugins/el6] Import upstream 1.1.6

[Ian McLeod]

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

    Import upstream 1.1.6

 .gitignore                |    1 +
 imagefactory-plugins.spec |   31 +++++++++++++++++++++++++++++--
 sources                   |    2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b32c3b..263d4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /imagefactory-plugins-1.1.3.tar.gz
 /imagefactory-plugins-1.1.4.tar.gz
 /imagefactory-plugins-1.1.5.tar.gz
+/imagefactory-plugins-1.1.6.tar.gz
diff --git a/imagefactory-plugins.spec b/imagefactory-plugins.spec
index 744e25d..93227cb 100644
--- a/imagefactory-plugins.spec
+++ b/imagefactory-plugins.spec
@@ -14,8 +14,8 @@ exit 0
 
 Summary: Default plugins for the Image Factory system image generation tool
 Name: imagefactory-plugins
-Version: 1.1.5
-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
@@ -164,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
 
@@ -185,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
 
@@ -258,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
@@ -323,7 +340,17 @@ 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
+* 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
diff --git a/sources b/sources
index ed32b45..19ccf6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8ec21c3a867599b2cd309fddae050ae  imagefactory-plugins-1.1.5.tar.gz
+77904d1423d94acddac5720eca02f85e  imagefactory-plugins-1.1.6.tar.gz