From 6bbf519b5424ef29adb30b2550b8215c45b31af2 Mon Sep 17 00:00:00 2001
From: Ian McLeod <imcleod@redhat.com>
Date: Mar 17 2016 00:27:55 +0000
Subject: Upstream 1.1.8 release


---

diff --git a/.gitignore b/.gitignore
index 742bde1..bf40bb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /imagefactory-1.1.4.tar.gz
 /imagefactory-1.1.6.tar.gz
 /imagefactory-1.1.7.tar.gz
+/imagefactory-1.1.8.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index d70bd27..f37bdff 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,7 +1,15 @@
+%if 0%{?fedora} >= 21 || 0%{?redhat} >= 7
+%global use_systemd 1
+%else
+%global use_systemd 0
+# This is, of course, not set in older RPMs and is needed below
+%global _unitdir /usr/lib/systemd/system
+%endif
+
 Summary: System image generation tool
 Name: imagefactory
-Version: 1.1.7
-Release: 3%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 Source0: http://repos.fedorapeople.org/repos/aeolus/imagefactory/%{version}/tarball/%{name}-%{version}.tar.gz
 License: ASL 2.0
 Group: Applications/System
@@ -18,10 +26,22 @@ Requires: python-httplib2
 Requires: python-argparse
 Requires: python-paste-deploy
 Requires: python-oauth2
+Requires: python-urlgrabber
+Requires: oz
+
+%if %{use_systemd}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: systemd-units
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
 Requires(preun): initscripts
+%endif
+
+
 BuildRequires: python2
 BuildRequires: python-setuptools
 # TODO: Any changes to the _internal_ API must increment this version or, in 
@@ -54,6 +74,27 @@ sed -i '/\/usr\/bin\/env python/d' %{buildroot}/%{python_sitelib}/imgfac/*.py
 %{__install} -m0600 conf/sysconfig/imagefactoryd %{buildroot}/%{_sysconfdir}/sysconfig/imagefactoryd
 %{__install} -m0600 conf/logrotate.d/imagefactoryd %{buildroot}/%{_sysconfdir}/logrotate.d/imagefactoryd
 
+# setup.py installs both of these which I suppose is OK
+# delete the one we don't want here
+%if %{use_systemd}
+rm -f %{buildroot}/%{_initddir}/imagefactoryd
+%else
+rm -f %{buildroot}/%{_unitdir}/imagefactoryd.service
+%endif
+
+%if %{use_systemd}
+
+%post
+%systemd_post imagefactoryd.service
+
+%preun
+%systemd_preun imagefactoryd.service
+
+%postun
+%systemd_postun imagefactoryd.service
+
+%else
+
 %post
 /sbin/chkconfig --add imagefactoryd
 
@@ -63,9 +104,15 @@ if [ $1 = 0 ] ; then
     /sbin/chkconfig --del imagefactoryd
 fi
 
+%endif
+
 %files
 %doc COPYING
+%if %{use_systemd}
+%{_unitdir}/imagefactoryd.service
+%else
 %{_initddir}/imagefactoryd
+%endif
 %config(noreplace) %{_sysconfdir}/imagefactory/imagefactory.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/imagefactoryd
 %config(noreplace) %{_sysconfdir}/logrotate.d/imagefactoryd
@@ -82,11 +129,12 @@ fi
 %{_bindir}/imagefactoryd
 
 %changelog
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+* Wed Mar 16 2016 Ian McLeod <imcleod@redhat.com> - 1.1.8-1
+- Upstream release 1.1.8
+- systemd support
+- docker base image updates
+- significant EC2 updates for regions and instance types
+- VMWare fusion vagrant box support
 
 * Wed Jan 7 2015 Ian McLeod <imcleod@redhat.com> - 1.1.7-1
 - Upstream release 1.1.7
diff --git a/sources b/sources
index f1f1829..cdab3d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c7d7e3a0f22eae3eaa64e2b98bd851f  imagefactory-1.1.7.tar.gz
+6a5ef3c7cc7e0d46238e5f97fe0cdd23  imagefactory-1.1.8.tar.gz