[deltacloud-core/f15] Version bump (0.4.1)

[Michal Fojtik]

commit 162e9a929de94489cb2f24e98c305cc5df220fe6
Author: Michal Fojtik <mi at mifo.sk>
Date:   Wed Oct 12 13:38:43 2011 +0200

    Version bump (0.4.1)

 .gitignore           |    3 ++
 deltacloud-core.spec |   55 ++++++++++++++++++++++++++++++++-----------------
 sources              |    4 ++-
 3 files changed, 42 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0342d4d..8b0b7c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 /deltacloud-core-0.3.0.gem
 /deltacloud-core-0.4.0.gem
+/0001-Backported-r1181859-patches.patch
+/0002-Google-storage-driver.patch
+/deltacloud-core-0.4.1.gem
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index c2833f3..de4bca2 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -2,8 +2,8 @@
 
 Summary: Deltacloud REST API
 Name: deltacloud-core
-Version: 0.4.0
-Release: 4%{?dist}
+Version: 0.4.1
+Release: 2%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
@@ -11,7 +11,8 @@ Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
 Source1: deltacloudd-fedora
 Source2: deltacloud-core.init
 Source3: deltacloud-core-config
-Patch1: 0001-Use-UUIDTools-instead-of-UUID-in-condor-driver.patch
+Patch1: 0002-Google-storage-driver.patch
+Patch2: 0001-Backported-r1181859-patches.patch
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(haml)
@@ -70,14 +71,22 @@ Requires: %{name}-rackspace = %{version}-%{release}
 Requires: %{name}-rimuhosting = %{version}-%{release}
 Requires: %{name}-rhevm = %{version}-%{release}
 Requires: %{name}-sbc = %{version}-%{release}
-#Requires: %{name}-terremark = %{version}-%{release}
+Requires: %{name}-terremark = %{version}-%{release}
 Requires: %{name}-vsphere = %{version}-%{release}
+Requires: %{name}-google
 
 %description all
 Deltacloud core with all available drivers
 
-# FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
-#
+%package google
+Summary: Deltacloud Core for Google storage
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(fog)
+
+%description google
+The google sub-package brings in all dependencies necessary to use deltacloud
+core to connect to Google Storage.
+
 #% package azure
 #Summary: Deltacloud Core for Azure
 #Requires: %{name} = %{version}-%{release}
@@ -168,15 +177,15 @@ Requires: %{name} = %{version}-%{release}
 The sbc sub-package brings in all dependencies necessary to use deltacloud core
 to connect to SBC.
 
-#% package terremark
-#Summary: Deltacloud Core for Terremark
-#Requires: %{name} = %{version}-%{release}
-#Requires: rubygem(fog)
-#Requires: rubygem(excon)
+%package terremark
+Summary: Deltacloud Core for Terremark
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(fog)
+Requires: rubygem(excon)
 
-#% description terremark
-#The terremark sub-package brings in all dependencies necessary to use deltacloud
-#core to connect to Terremark.
+%description terremark
+The terremark sub-package brings in all dependencies necessary to use deltacloud
+core to connect to Terremark.
 
 %package vsphere
 Summary: Deltacloud Core for vSphere
@@ -214,9 +223,6 @@ chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
 # temporarily remove Azure drivers until all dependencies will be pushed in to Fedora
 rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
 
-# temporarily remove terremark support files until we enable terremark
-rm -f %{buildroot}%{app_root}/config/drivers/terremark.yaml
-
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name}
 
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
@@ -313,13 +319,24 @@ fi
 %files sbc
 %{app_root}/config/drivers/sbc.yaml
 
-#% files terremark
-#%{app_root}/config/drivers/terremark.yaml
+%files terremark
+%{app_root}/config/drivers/terremark.yaml
 
 %files vsphere
 %{app_root}/config/drivers/vsphere.yaml
 
+%files google
+%defattr(-, root, root, -)
+%{app_root}/config/drivers/google.yaml
+
 %changelog
+* Wed Oct 12 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-2
+- Backported latest fixes in hardware profiles
+- Backported Google Storage driver
+
+* Wed Oct 12 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-1
+- Version bump (0.4.1)
+
 * Thu Sep 29 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-4
 - Add a patch to re-enable deltacloud-core-condor
 
diff --git a/sources b/sources
index e35ef45..a70f1e7 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-d07fcd383cbd13828f26534c97a855fc  deltacloud-core-0.4.0.gem
+c29d9bd8b82d4c8f1c5ac7c69b3e9b22  0001-Backported-r1181859-patches.patch
+5a110ceb808d751cf9ce8fd5497847bb  0002-Google-storage-driver.patch
+83a4110796feece905c1911d8b7472d7  deltacloud-core-0.4.1.gem