[imagefactory/f21] import upstream 1.1.6

[Ian McLeod]

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

    import upstream 1.1.6

 .gitignore        |    1 +
 imagefactory.spec |   15 +++++++++++----
 sources           |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bce612d..f7f1d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /imagefactory-1.1.2.tar.gz
 /imagefactory-1.1.3.tar.gz
 /imagefactory-1.1.4.tar.gz
+/imagefactory-1.1.6.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index b2032ff..76b1850 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,12 +1,15 @@
 Summary: System image generation tool
 Name: imagefactory
-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
 Requires: python-pycurl
 Requires: python-libguestfs
 Requires: python-zope-interface
@@ -79,8 +82,12 @@ fi
 %{_bindir}/imagefactoryd
 
 %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
+
+* Tue May 6 2014 Ian McLeod <imcleod at redhat.com> - 1.1.5-1
+- Rebase with upstream
+- Improved CLI parameter passing support
 
 * Thu Jan 30 2014 Steve Loranz <sloranz at redhat.com> - 1.1.3-1
 - Remove references to man directories. Documentation will be hosted @ imgfac.org.
diff --git a/sources b/sources
index 2be0260..18dbf96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0dce8145b5b6ba0bf89d563dd1d2147  imagefactory-1.1.4.tar.gz
+1aa6c1f36be20bf0d6562fc3af525ba0  imagefactory-1.1.6.tar.gz