From 444e9fd63b96a91c71bbff9c4c8ae63663caceb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 18 Sep 2014 22:37:52 +0200
Subject: [PATCH] rOCCI server 1.0.5 on branch 1.0.x.

---
 rOCCI-server.spec                                  | 37 ++++------------------
 ...bundle.diff => rocci-server-1.0.x-unbundle.diff | 15 +++------
 2 files changed, 11 insertions(+), 41 deletions(-)
 rename rocci-server-unbundle.diff => rocci-server-1.0.x-unbundle.diff (82%)

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 0fe74b5..e327e7b 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -2,7 +2,7 @@
 %global app_root %{_datadir}/%{name}
 %global semodule_name rocci_server
 
-%global commit 596cd1f3c36dbd709ffe886bd8fd94c94b9d0925
+%global commit aa036b71edcffd0e531a3ceba5b7113d40577977
 
 %if 0%{?fedora} && 0%{?fedora} <= 20 || 0%{?rhel} && 0%{?rhel} <= 7
 %global openssl_cms openssl_cms_2_0_0
@@ -11,8 +11,8 @@
 %endif
 
 Name:           rOCCI-server
-Version:        1.1.0
-Release:        0.beta.2%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Ruby OCCI Server
 
 License:        ASL 2.0
@@ -24,7 +24,7 @@ Source3:        %{name}.logrotate
 Source4:        README.Fedora
 # kill the bundler
 # (not intended for upstream)
-Patch0:         rocci-server-unbundle.diff
+Patch0:         rocci-server-1.0.x-unbundle.diff
 
 BuildArch:      noarch
 BuildRequires:  policycoreutils-python
@@ -48,8 +48,8 @@ Requires:       rubygem(logstasher)
 Requires:       rubygem(rails) >= 4.0.0
 Requires:       rubygem(rails) < 4.2
 Requires:       rubygem(rails-api)
-Requires:       rubygem(occi-core) >= 4.3.0
-Requires:       rubygem(occi-core) < 4.4
+Requires:       rubygem(occi-core) >= 4.2.15
+Requires:       rubygem(occi-core) < 4.3
 Requires:       rubygem(rack-cors)
 Requires:       rubygem(warden) >= 1.2.3
 Requires:       rubygem(%{openssl_cms})
@@ -76,23 +76,6 @@ Requires:       %{name} = %{version}-%{release}
 Documentation for %{name}.
 
 
-%package ec2
-Summary:        Amazon backend for %{gem_name}
-BuildArch:      noarch
-Requires:       rubygem(aws-sdk-core) >= 2.0.1
-Requires:       rubygem(aws-sdk-core) < 2.1
-Requires:       %{name} = %{version}-%{release}
-
-%description ec2
-OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
-specifying a protocol and API to perform various remote management tasks in
-clouds. The rOCCI-server extends cloud managers, which are not OCCI-compliant
-natively, with its own OCCI interface. It is based on the rOCCI (Ruby OCCI)
-Framework.
-
-This package provides Amazon Web Services backend for OCCI server.
-
-
 %package opennebula
 Summary:        Opennebula backend for %{gem_name}
 BuildArch:      noarch
@@ -271,7 +254,6 @@ fi
 %exclude %{app_root}/.bundle/
 %exclude %{app_root}/.rspec
 %exclude %{app_root}/.travis.yml
-%exclude %{app_root}/.yardopts
 %exclude %{app_root}/Guardfile
 
 %files doc
@@ -284,18 +266,11 @@ fi
 %{app_root}/README.md
 %{app_root}/Rakefile
 
-%files ec2
-%{app_root}/lib/backends/ec2/
-%{app_root}/lib/backends/ec2_backend.rb
-
 %files opennebula
 %{app_root}/lib/backends/opennebula/
 %{app_root}/lib/backends/opennebula_backend.rb
 
 
 %changelog
-* Sat Oct 04 2014 František Dvořák <valtri@civ.zcu.cz> - 1.1.0-0.beta.2
-- Release 1.1.0.beta.2
-
 * Sat Oct 04 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1
 - Initial package
diff --git a/rocci-server-unbundle.diff b/rocci-server-1.0.x-unbundle.diff
similarity index 82%
rename from rocci-server-unbundle.diff
rename to rocci-server-1.0.x-unbundle.diff
index cc96e0a..a503fcd 100644
--- a/rocci-server-unbundle.diff
+++ b/rocci-server-1.0.x-unbundle.diff
@@ -1,13 +1,14 @@
+commit f1a70411dc804b9861593632e13142feac4d244d
 Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Thu Sep 18 16:10:01 2014 +0200
+Date:   Thu Sep 18 22:36:18 2014 +0200
 
-    Remove the bundler.
+    Remove the bundler (branch 1.0.x).
 
 diff --git a/config/application.rb b/config/application.rb
-index 98480fb..e768d67 100644
+index 6f37af1..72c497e 100644
 --- a/config/application.rb
 +++ b/config/application.rb
-@@ -8,9 +8,30 @@ require 'action_controller/railtie'
+@@ -8,9 +8,24 @@ require 'action_controller/railtie'
  require 'rails/test_unit/railtie'
  # require 'sprockets/railtie'
  
@@ -26,16 +27,10 @@ index 98480fb..e768d67 100644
 +require 'hashie'
 +require 'ice_nine'
 +require 'occi-core'
-+# ec2 backend
-+begin
-+  require 'aws-sdk-core'
-+rescue LoadError
-+end
 +# opennebula backend
 +begin
 +  require 'opennebula'
 +  require 'erubis'
-+  require 'ox'
 +rescue LoadError
 +end
  
-- 
1.8.2.3