[imagefactory/f16] update to imagefactory 0.7.0

[Mohammed Morsi]

commit 30cb5af80f1bd66e356e76911d33dd0831864d3c
Author: Mo Morsi <mmorsi at redhat.com>
Date:   Tue Oct 11 11:16:20 2011 -0400

    update to imagefactory 0.7.0

 .gitignore        |    1 +
 imagefactory.spec |   76 +++++++++++++++++++++++++---------------------------
 sources           |    2 +-
 3 files changed, 39 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e3bd6d..76533e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /imagefactory-0.3.1.tar.gz
+/imagefactory-0.7.0.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index 8df40b4..bf9766a 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,13 +1,14 @@
-Summary: System image generation tool
+Summary: Image Factory system image generation tool
 Name: imagefactory
-Version: 0.3.1
-Release: 3%{?dist}
-Source0: http://repos.fedorapeople.org/repos/aeolus/image-factory/%{version}/tarball/%{name}-%{version}.tar.gz
-License: ASL 2.0
-Group: Applications/System
-URL: http://www.aeolusproject.org/imagefactory.html
+Version: 0.7.0
+Release: 1%{?dist}
+Source0: %{name}-%{version}.tar.gz
+License: GPLv2
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Url: http://www.aeolusproject.org/imagefactory.html
 BuildArch: noarch
-Requires: oz
+Requires: oz >= 0.7.0
 Requires: euca2ools
 Requires: python-qmf
 Requires: python-pycurl
@@ -20,10 +21,10 @@ Requires: python-argparse
 Requires: python-cloudservers
 Requires: python-psphere
 Requires: VMDKstream
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
+Requires: python-suds >= 0.4.1
+Requires: python-paste-deploy
+Requires: python-oauth2
+BuildRequires: python
 BuildRequires: python-setuptools
 
 %description
@@ -32,43 +33,40 @@ a build request is received, imagefactory will build the requested image
 for the requested target.
 
 %prep
-%setup -q
+%setup -n %{name}-%{version}
 
 %build
-%{__python} setup.py build
+python setup.py build
 
 %install
-%{__python} setup.py install --root=%{buildroot} --skip-build
+%{__rm} -rf $RPM_BUILD_ROOT
+python setup.py install -O1 --root=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/imagefactory/jeos_images
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/imagefactory/images
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-sed -i '/\/usr\/bin\/env python/d' %{buildroot}/%{python_sitelib}/imagefactory/*.py
-
-
-%post
-/sbin/chkconfig --add %{name}
-
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service %{name} stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}
-fi
+%postun
+/sbin/service imagefactory condrestart > /dev/null 2>&1 || :
 
 %files
-%doc COPYING
-%{_initddir}/imagefactory
-%config(noreplace) %{_sysconfdir}/imagefactory.conf
+%defattr(-,root,root,-)
+%doc COPYING version.txt
+%{_initrddir}/imagefactory
+%config(noreplace) %{_sysconfdir}/imagefactory/imagefactory.conf
 %dir %attr(0755, root, root) %{_sysconfdir}/pki/imagefactory/
-%config %{_sysconfdir}/pki/imagefactory/cert-ec2.pem
-%{python_sitelib}/imagefactory/
+%dir %attr(0755, root, root) %{_sysconfdir}/imagefactory/jeos_images/
+%dir %attr(0755, root, root) %{_localstatedir}/lib/imagefactory/images
+%{_sysconfdir}/pki/imagefactory/cert-ec2.pem
+%{python_sitelib}/imgfac
 %{python_sitelib}/imagefactory-*.egg-info
-%{_bindir}/imgfac.py
+%{_bindir}/imagefactory
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jul 20 2011 Chris Lalancette <clalance at redhat.com> - 0.3.1-3
-- More updates after package review
-
-* Tue Jul 19 2011 Chris Lalancette <clalance at redhat.com> - 0.3.1-2
-- Updates after package review
+* Thu Sep 15 2011 Ian McLeod <imcleod at redhat.com> - 0.6.1
+- Update Oz requirement to 0.7.0 or later for new target-specific package config
+- Update SPEC file to restart service after an install 
 
-* Wed Jul 13 2011 Chris Lalancette <clalance at redhat.com> - 0.3.1-1
-- Initial package
+* Mon Apr 04 2011 Chris Lalancette <clalance at redhat.com> - 0.1.6-1
+- Initial spec file.
diff --git a/sources b/sources
index d7ffeda..4e6b5ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2ecae95102be77a2e1329276035bfce  imagefactory-0.3.1.tar.gz
+dd16ae1d0a210a419735a2a0fc66ab4c  imagefactory-0.7.0.tar.gz