[imagefactory-plugins/f20] rebase with upstream 1.1.4-1
Ian McLeod
imcleod at fedoraproject.org
Thu Feb 13 04:25:19 UTC 2014
commit 5f58d801e88c47b8218a70d178ea96afba37451f
Author: Ian McLeod <imcleod at redhat.com>
Date: Wed Feb 12 22:25:48 2014 -0600
rebase with upstream 1.1.4-1
.gitignore | 1 +
imagefactory-plugins.spec | 21 +++++++++++++++++++--
sources | 2 +-
3 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba5058c..8dc0068 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/imagefactory-1.1.3.tar.gz
/imagefactory-plugins-1.1.3.tar.gz
+/imagefactory-plugins-1.1.4.tar.gz
diff --git a/imagefactory-plugins.spec b/imagefactory-plugins.spec
index e008209..d498801 100644
--- a/imagefactory-plugins.spec
+++ b/imagefactory-plugins.spec
@@ -14,8 +14,8 @@ exit 0
Summary: Default plugins for the Image Factory system image generation tool
Name: imagefactory-plugins
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
Source0: http://repos.fedorapeople.org/repos/aeolus/imagefactory/%{version}/tarball/%{name}-%{version}.tar.gz
License: ASL 2.0
Group: Applications/System
@@ -149,6 +149,7 @@ A plugin for RHEVM "clouds"
%package vSphere
Summary: vSphere Cloud plugin
License: ASL 2.0
+Requires: VMDKstream
Requires: imagefactory-plugins
Requires: python-psphere
Requires: imagefactory-plugin-api = 1.0
@@ -174,6 +175,13 @@ Requires: imagefactory-plugins-Rackspace
These configuration files point to existing JEOS Image ID's on Rackspace that
can be used to do "snapshot" style builds.
+%package Docker
+Summary: Cloud plugin for Docker
+License: ASL 2.0
+
+%description Docker
+A Cloud plugin to support Docker
+
%prep
%setup -q
@@ -242,6 +250,11 @@ rm -rf %{buildroot}%{python_sitelib}/imagefactory_plugins/MockCloud
%postun Rackspace
%auto_register_macro_postun Rackspace
+%post Docker
+%auto_register_macro_post Docker
+%postun Docker
+%auto_register_macro_postun Docker
+
%files
%doc COPYING
%dir %{python_sitelib}/imagefactory_plugins
@@ -303,6 +316,10 @@ rm -rf %{buildroot}%{python_sitelib}/imagefactory_plugins/MockCloud
%dir %{python_sitelib}/imagefactory_plugins/Rackspace
%{python_sitelib}/imagefactory_plugins/Rackspace/*
+%files Docker
+%dir %{python_sitelib}/imagefactory_plugins/Docker
+%{python_sitelib}/imagefactory_plugins/Docker/*
+
%changelog
* Mon Sep 23 2013 Ian McLeod <imcleod at redhat.com> - 1.1.3-2
- Add abort() method to TinMan plugin
diff --git a/sources b/sources
index 989f0f2..88317c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11fdf14f2f1fd1e2998237692642b942 imagefactory-plugins-1.1.3.tar.gz
+d1485d67840442896ff0743a29f913f3 imagefactory-plugins-1.1.4.tar.gz
More information about the scm-commits
mailing list