[imagefactory/f20] import upstream 1.1.3 release

Ian McLeod imcleod at fedoraproject.org
Thu Aug 29 13:46:12 UTC 2013 

commit 43bb37a3cf4deaf918f321068850a5ccff1d7391
Author: Ian McLeod <imcleod at redhat.com>
Date:   Thu Aug 29 08:45:53 2013 -0500

    import upstream 1.1.3 release

 .gitignore        |    1 +
 imagefactory.spec |  100 ++++++++++++++++-------------------------------------
 sources           |    2 +-
 3 files changed, 32 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8177da..36527fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /imagefactory-0.7.1.tar.gz
 /imagefactory-1.1.1.tar.gz
 /imagefactory-1.1.2.tar.gz
+/imagefactory-1.1.3.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index 04a543e..887d546 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,60 +1,37 @@
 Summary: System image generation tool
 Name: imagefactory
-Version: 1.1.2
-Release: 2%{?dist}
-# Source0: https://github.com/aeolusproject/%{name}/archive/
-Source0: %{name}-%{version}.tar.gz
+Version: 1.1.3
+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
-
-Requires: oz >= 0.7.0
-Requires: euca2ools
 Requires: python-pycurl
 Requires: python-libguestfs
 Requires: python-zope-interface
-Requires: python-boto >= 2.0
 Requires: libxml2-python
 Requires: python-httplib2
 Requires: python-argparse
-Requires: python-cloudservers
-Requires: python-psphere
-Requires: VMDKstream
-Requires: python-suds >= 0.4.1
 Requires: python-paste-deploy
 Requires: python-oauth2
-Requires: qemu-img
-# We need this for dc-rhev-image
-# TODO: Remove this requirement when move pushing internal to the factory
-Requires: iwhd >= 1.2
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
 Requires(preun): initscripts
+BuildRequires: python2
 BuildRequires: python-setuptools
+# TODO: Any changes to the _internal_ API must increment this version or, in 
+#       the case of backwards compatible changes, add a new version (RPM 
+#       allows multiple version "=" lines for the same package or 
+#       pseudo-package name)
+Provides: imagefactory-plugin-api = 1.0
 
 %description
 imagefactory allows the creation of system images for multiple virtualization
 and cloud providers from a single template definition. See 
 http://aeolusproject.org/projects/imagefactory for more information.
 
-%package jeosconf-ec2-fedora
-Summary: Configuration for JEOS images for EC2
-License: ASL 2.0
-Requires: %{name} = %{version}-%{release}
-
-%description jeosconf-ec2-fedora
-The configuration file for Fedora EC2 JEOS images.
-
-%package jeosconf-ec2-rhel
-Summary: Configuration for JEOS images for EC2
-License: ASL 2.0
-Requires: %{name} = %{version}-%{release}
-
-%description jeosconf-ec2-rhel
-The configuration file for Fedora EC2 JEOS images.
-
 %prep
 %setup -q
 
@@ -64,66 +41,49 @@ python setup.py build
 %install
 python setup.py install -O1 --root=%{buildroot} --skip-build
 
-install -d %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
-install -d %{buildroot}/%{_localstatedir}/lib/imagefactory/images
-install -d %{buildroot}/%{_sysconfdir}/logrotate.d
+%{__install} -d %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
+%{__install} -d %{buildroot}/%{_localstatedir}/lib/imagefactory/images
+%{__install} -d %{buildroot}/%{_sysconfdir}/imagefactory/plugins.d
+%{__install} -d %{buildroot}/%{_sysconfdir}/logrotate.d
 
 sed -i '/\/usr\/bin\/env python/d' %{buildroot}/%{python_sitelib}/imgfac/*.py
 
-install conf/ec2_fedora_jeos.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
-install conf/ec2_rhel_jeos.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
-install -m0600 conf/imagefactory.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/imagefactory
-install -m0600 conf/imagefactory.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/imagefactory
+%{__install} -m0600 conf/sysconfig/imagefactoryd %{buildroot}/%{_sysconfdir}/sysconfig/imagefactoryd
+%{__install} -m0600 conf/logrotate.d/imagefactoryd %{buildroot}/%{_sysconfdir}/logrotate.d/imagefactoryd
 
 %post
-/sbin/chkconfig --add %{name}
+/sbin/chkconfig --add imagefactoryd
 
 %preun
 if [ $1 = 0 ] ; then
-    /sbin/service %{name} stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}
+    /sbin/service imagefactoryd stop >/dev/null 2>&1
+    /sbin/chkconfig --del imagefactoryd
 fi
 
 %files
 %doc COPYING
-%{_initddir}/imagefactory
+%{_initddir}/imagefactoryd
 %config(noreplace) %{_sysconfdir}/imagefactory/imagefactory.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/imagefactoryd
+%config(noreplace) %{_sysconfdir}/logrotate.d/imagefactoryd
 %dir %attr(0755, root, root) %{_sysconfdir}/pki/imagefactory/
 %dir %attr(0755, root, root) %{_sysconfdir}/imagefactory/jeos_images/
+%dir %attr(0755, root, root) %{_sysconfdir}/imagefactory/plugins.d/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/imagefactory/images
 %config %{_sysconfdir}/pki/imagefactory/cert-ec2.pem
-%{python_sitelib}/imgfac
+%{python_sitelib}/imgfac/*.py*
+%{python_sitelib}/imgfac/rest
+%{python_sitelib}/imgfac/picklingtools
 %{python_sitelib}/imagefactory-*.egg-info
 %{_bindir}/imagefactory
+%{_bindir}/imagefactoryd
 %{_mandir}/man1/*
-
-%files jeosconf-ec2-fedora
-%{_sysconfdir}/imagefactory/jeos_images/ec2_fedora_jeos.conf
-
-%files jeosconf-ec2-rhel
-%{_sysconfdir}/imagefactory/jeos_images/ec2_rhel_jeos.conf
+%{_mandir}/man5/*
+%{_mandir}/man7/*
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 22 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.1.2-1
-- Update to 1.1.2
-- Merge F-17 changes to rawhide
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Oct 13 2011 Ian McLeod <imcleod at redhat.com> - 0.7.1-1
-- Incorporate subpackage improvement from clalance at redhat.com
+* Thu Aug 15 2013 Ian McLeod <imcleod at redhat.com> - 1.1.3
+- Rebase with upstream
 
 * 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
diff --git a/sources b/sources
index 27192b0..6eb1e57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87fe8a01d6f6a8d0d24f50582fc8315b  imagefactory-1.1.2.tar.gz
+07e940b5a5f6ef9aaa44a351772520da  imagefactory-1.1.3.tar.gz

More information about the scm-commits mailing list