[deltacloud-core] Version 1.0.4

[Michal Fojtik]

commit 9f85d4ea0f83afab22b75ed2c5addfe7c5306058
Author: Michal Fojtik <mfojtik at redhat.com>
Date:   Mon Oct 29 11:47:40 2012 +0100

    Version 1.0.4

 .gitignore           |    1 +
 deltacloud-core.spec |   66 +++++++------------------------------------------
 sources              |    2 +-
 3 files changed, 12 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96b8532..39f358a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /deltacloud-client-1.0.2rc1.gem
 /deltacloud-client-1.0.3.gem
 /deltacloud-core-1.0.3.gem
+/deltacloud-core-1.0.4.gem
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 2309b0a..fbf04f1 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -2,7 +2,7 @@
 
 Summary: Deltacloud REST API
 Name: deltacloud-core
-Version: 1.0.3
+Version: 1.0.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
@@ -63,8 +63,6 @@ Documentation for %{name}
 %package all
 Summary: Deltacloud Core with all drivers
 Requires: %{name} = %{version}-%{release}
-#Requires: %{name}-azure
-#Requires: %{name}-condor
 Requires: %{name}-ec2
 Requires: %{name}-eucalyptus
 Requires: %{name}-gogrid
@@ -73,7 +71,6 @@ Requires: %{name}-rackspace
 Requires: %{name}-rimuhosting
 Requires: %{name}-rhevm
 Requires: %{name}-sbc
-#Requires: %{name}-terremark
 Requires: %{name}-vsphere
 Requires: %{name}-google
 Requires: %{name}-openstack
@@ -82,17 +79,6 @@ Requires: %{name}-fgcp
 %description all
 Deltacloud core with all available drivers
 
-# FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
-#
-#% package azure
-#Summary: Deltacloud Core for Azure
-#Requires: %{name} = %{version}-%{release}
-#Requires: rubygem(waz-blobs)
-
-#% description azure
-#The azure sub-package brings in all dependencies necessary to use deltacloud
-#core to connect to Azure.
-
 %package google
 Summary: Deltacloud Core for Google storage
 Requires: %{name} = %{version}-%{release}
@@ -102,18 +88,6 @@ Requires: rubygem(fog)
 The google sub-package brings in all dependencies necessary to use deltacloud
 core to connect to Google Storage.
 
-#%package condor
-#Summary: Deltacloud Core for CondorCloud
-#Requires: %{name} = %{version}-%{release}
-#Requires: rubygem(uuidtools)
-#Requires: rubygem(rest-client)
-#Requires: condor >= 7.4.0
-#Requires: condor-vm-gahp >= 7.4.0
-
-#%description condor
-#The condor sub-package brings in all dependencies necessary to use deltacloud core
-#to connect to CondorCloud.
-
 %package ec2
 Summary: Deltacloud Core for EC2
 Requires: %{name} = %{version}-%{release}
@@ -193,16 +167,6 @@ 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)
-
-#%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
 Requires: %{name} = %{version}-%{release}
@@ -260,9 +224,6 @@ rm %{buildroot}%{app_root}/config/drivers/aruba.yaml
 
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name} &> /dev/null
 
-# Remove relic from vsphere patching
-rm -rf %{buildroot}%{app_root}/lib/deltacloud/drivers/ec2/ec2_driver.rb.orig
-
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 
 # the condor stuff is provided by the condor-cloud package; it really doesn't
@@ -273,12 +234,12 @@ rm -rf %{buildroot}%{app_root}/support/fedora
 
 %check
 pushd %{buildroot}%{app_root}
-testrb tests/deltacloud/*_test.rb
-testrb tests/helpers/core_ext/*_test.rb
-testrb tests/helpers/rack/*_test.rb
-testrb tests/drivers/base/*_test.rb
-testrb tests/drivers/mock/*_test.rb
-testrb tests/drivers/models/*_test.rb
+ruby tests/deltacloud/*_test.rb
+ruby tests/helpers/core_ext/*_test.rb
+ruby tests/helpers/rack/*_test.rb
+ruby tests/drivers/base/*_test.rb
+ruby tests/drivers/mock/*_test.rb
+ruby tests/drivers/models/*_test.rb
 popd
 
 %clean
@@ -332,13 +293,6 @@ fi
 
 %files all
 
-#%files azure
-
-#%files condor
-#%{app_root}/config/drivers/condor.yaml
-#%{app_root}/config/condor.yaml
-#%{app_root}/config/addresses.xml
-
 %files ec2
 %{app_root}/config/drivers/ec2.yaml
 
@@ -366,9 +320,6 @@ fi
 %files sbc
 %{app_root}/config/drivers/sbc.yaml
 
-#%files terremark
-#%{app_root}/config/drivers/terremark.yaml
-
 %files vsphere
 %{app_root}/config/drivers/vsphere.yaml
 
@@ -380,6 +331,9 @@ fi
 %{app_root}/config/drivers/google.yaml
 
 %changelog
+* Mon Oct 29 2012 Michal Fojtik <mfojtik at redhat.com> - 1.0.4-1
+- Release 1.0.4
+
 * Mon Sep 17 2012 Michal Fojtik <mfojtik at redhat.com> - 1.0.3-1
 - Release 1.0.3
 
diff --git a/sources b/sources
index f5c21ad..bfb8bd9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 bf4e5d4bf5785f4c4064de0866c84e4b  deltacloud-core.service
-7de016c81d46ffed09da4193718c3e3c  deltacloud-core-1.0.3.gem
+10e141b3907e4173f5eef341c698c186  deltacloud-core-1.0.4.gem