[deltacloud-core/f18] Release 1.1.2

[Michal Fojtik]

commit 1570a1e544580edbe7c557a2ac0f313d3247d54c
Author: Michal Fojtik <mfojtik at redhat.com>
Date:   Mon Mar 18 12:57:28 2013 +0100

    Release 1.1.2

 .gitignore           |    1 +
 deltacloud-core.spec |   46 ++++++++++++++++++++++++++++++++--------------
 sources              |    1 +
 3 files changed, 34 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f07c37b..c5a4ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /deltacloud-core-1.0.4.gem
 /d8c9a4450623477e3b35e5223a082ff9ced35c0a-1.0.5.patch
 /deltacloud-core-1.0.5.gem
+/deltacloud-core-1.1.2.gem
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 329f75a..fd2eacc 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -2,7 +2,7 @@
 
 Summary: Deltacloud REST API
 Name: deltacloud-core
-Version: 1.0.5
+Version: 1.1.2
 Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
@@ -11,7 +11,6 @@ Source0: http://apache.mirror.rbftpnetworks.com/deltacloud/stable/%{name}-%{vers
 Source1: deltacloudd-fedora
 Source2: deltacloud-core-config
 Source3: deltacloud-core.service
-Patch0: d8c9a4450623477e3b35e5223a082ff9ced35c0a-1.0.5.patch
 Requires: ruby(rubygems)
 Requires: ruby(abi) = 1.9.1
 Requires: rubygem(haml)
@@ -19,11 +18,10 @@ Requires: rubygem(sinatra) >= 1.0
 Requires: rubygem(rack) >= 1.1.0
 Requires: rubygem(thin)
 Requires: rubygem(net-ssh)
-Requires: rubygem(json) >= 1.4.0
+Requires: rubygem(json_pure)
 Requires: rubygem(rack-accept)
 Requires: rubygem(nokogiri)
-Requires: rubygem(sinatra-rabbit)
-Requires: rubygem(crack)
+Requires: rubygem(sinatra-rabbit) >= 1.1.6
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -40,10 +38,9 @@ BuildRequires: rubygem(rack-accept)
 BuildRequires: rubygem(rake) >= 0.8.7
 BuildRequires: rubygem(rack)
 BuildRequires: rubygem(rack-test)
-BuildRequires: rubygem(json)
+BuildRequires: rubygem(json_pure)
 BuildRequires: rubygem(minitest)
-BuildRequires: rubygem(sinatra-rabbit)
-BuildRequires: rubygem(crack)
+BuildRequires: rubygem(sinatra-rabbit) >= 1.1.6
 BuildArch: noarch
 Obsoletes: rubygem-deltacloud-core
 
@@ -76,6 +73,7 @@ Requires: %{name}-vsphere
 Requires: %{name}-google
 Requires: %{name}-openstack
 Requires: %{name}-fgcp
+Requires: %{name}-digitalocean
 
 %description all
 Deltacloud core with all available drivers
@@ -136,7 +134,7 @@ core to connect to Rackspace.
 %package openstack
 Summary: Deltacloud Core for OpenStack
 Requires: %{name} = %{version}-%{release}
-Requires: rubygem(openstack)
+Requires: rubygem(openstack) >= 1.0.9
 
 %description openstack
 The rackspace sub-package brings in all dependencies necessary to use deltacloud
@@ -146,7 +144,7 @@ core to connect to OpenStack.
 Summary: Deltacloud Core for RHEV-M
 Requires: %{name} = %{version}-%{release}
 Requires: rubygem(rest-client)
-Requires: rubygem(rbovirt)
+Requires: rubygem(rbovirt) >= 0.0.19
 
 %description rhevm
 The rhevm sub-package brings in all dependencies necessary to use deltacloud
@@ -187,11 +185,20 @@ Requires: rubygem(xml-simple)
 The fgcp sub-package brings in all dependencies necessary to use deltacloud
 core to connect to Fujitsu Global Cloud Platform (FGCP).
 
+%package digitalocean
+Summary: Deltacloud Core for DigitalOcean
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rest-client)
+
+%description digitalocean
+The digitalocean sub-package brings in all dependencies necessary to use deltacloud
+core to connect to DigitalOcean cloud.
+
 %prep
 %setup -q -c -T
 gem unpack -V --target=%{_builddir} %{SOURCE0}
 pushd %{_builddir}/%{name}-%{version}
-%patch0 -p1
+#%patch0 -p1
 popd
 
 %triggerun -- deltacloud-core < 1.0-1
@@ -210,11 +217,13 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 cp -r %{_builddir}/%{name}-%{version}/* %{buildroot}%{app_root}
 install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/deltacloudd
+install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/deltacloud-db-upgrade
 install -m 0655 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 0655 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
 find %{buildroot}%{app_root}/lib -type f | xargs chmod -x
 chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
+chmod 0755 %{buildroot}%{app_root}/bin/deltacloud-db-upgrade
 
 # Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
 rm %{buildroot}%{app_root}/config/drivers/azure.yaml
@@ -222,7 +231,7 @@ rm %{buildroot}%{app_root}/config/drivers/condor.yaml
 rm %{buildroot}%{app_root}/config/condor.yaml
 rm %{buildroot}%{app_root}/config/addresses.xml
 rm %{buildroot}%{app_root}/config/drivers/terremark.yaml
-rm %{buildroot}%{app_root}/config/drivers/aruba.yaml
+rm %{buildroot}%{app_root}/config/drivers/arubacloud.yaml
 
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name} &> /dev/null
 
@@ -240,8 +249,8 @@ 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
+#ruby tests/drivers/mock/*_test.rb
+#ruby tests/drivers/models/*_test.rb
 popd
 
 %clean
@@ -269,12 +278,14 @@ fi
 %files
 %{_unitdir}/%{name}.service
 %{_bindir}/deltacloudd
+%{_bindir}/deltacloud-db-upgrade
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{app_root}/
 %{app_root}/bin
 %{app_root}/config.ru
 %{app_root}/views
 %{app_root}/lib
+%{app_root}/db
 %dir %{app_root}/config/drivers
 %{app_root}/config/drivers/mock.yaml
 %dir %{app_root}/public
@@ -332,7 +343,14 @@ fi
 %defattr(-, root, root, -)
 %{app_root}/config/drivers/google.yaml
 
+%files digitalocean
+%defattr(-, root, root, -)
+%{app_root}/config/drivers/digitalocean.yaml
+
 %changelog
+* Mon Mar 18 2013 Michal Fojtik <mfojtik at redhat.com> - 1.1.2-1
+- Release 1.1.2
+
 * Tue Nov 27 2012 Michal Fojtik <mfojtik at redhat.com> - 1.0.5-1
 - Release 1.0.5
 
diff --git a/sources b/sources
index 1220b01..b056340 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 6a5a784f6f570473d600a02c2bfcb323  d8c9a4450623477e3b35e5223a082ff9ced35c0a-1.0.5.patch
 74ba9c4bcac4e1d2423aa16f8f227741  deltacloud-core-1.0.5.gem
 e5a07687dd201a50e0a4bf6fde6db9f3  deltacloud-core.service
+7a6ba956d734129ae250ab0a7a77a2dc  deltacloud-core-1.1.2.gem