From a6260732439689e856d3fd8879bc02f25c16cdf7 Mon Sep 17 00:00:00 2001
From: Ian McLeod <imcleod@redhat.com>
Date: May 30 2014 20:03:06 +0000
Subject: rebase with upstream 1.1.5


---

diff --git a/.gitignore b/.gitignore
index bce612d..d0ef1e1 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.5.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index 858f2a0..2036b55 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,12 +1,15 @@
 Summary: System image generation tool
 Name: imagefactory
-Version: 1.1.4
+Version: 1.1.5
 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,6 +82,10 @@ fi
 %{_bindir}/imagefactoryd
 
 %changelog
+* Tue May 6 2014 Ian McLeod <imcleod@redhat.com> - 1.1.5-1
+- Rebase with upstream
+- Improved CLI parameter passing support
+
 * Thu Jan 30 2014 Steve Loranz <sloranz@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..7774f70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0dce8145b5b6ba0bf89d563dd1d2147  imagefactory-1.1.4.tar.gz
+eab6a1f9d0dec1b7d60a3fc9d0f0d3c0  imagefactory-1.1.5.tar.gz