From a8fc3cdee75025001092a862522758f75806267a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sat, 4 Oct 2014 06:45:16 +0200
Subject: [PATCH] Rebase to 1.1.0.beta2 (2014-10-03).

---
 rOCCI-server.spec | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index e2d19bd..734c5ae 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -2,9 +2,7 @@
 %global app_root %{_datadir}/%{name}
 %global semodule_name rocci_server
 
-%global commit b11ad8c1e9af02896c6dc3c64e9a331b50cb9d83
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20140918
+%global commit 596cd1f3c36dbd709ffe886bd8fd94c94b9d0925
 
 %if 0%{?fedora} && 0%{?fedora} <= 20 || 0%{?rhel} && 0%{?rhel} <= 7
 %global openssl_cms openssl_cms_2_0_0
@@ -13,8 +11,8 @@
 %endif
 
 Name:           rOCCI-server
-Version:        1.0.5
-Release:        1.%{date}git%{shortcommit}%{?dist}
+Version:        1.1.0
+Release:        0.beta.2%{?dist}
 Summary:        Ruby OCCI Server
 
 License:        ASL 2.0
@@ -44,15 +42,14 @@ Requires:       mod_ssl
 Requires:       rubygem(dalli)
 Requires:       rubygem(hashie)
 Requires:       rubygem(ice_nine)
-Requires:       rubygem(jbuilder)
 Requires:       rubygem(kgio)
 Requires:       rubygem(logstasher)
 Requires:       rubygem(passenger)
 Requires:       rubygem(rails) >= 4.0.0
 Requires:       rubygem(rails) <= 4.1
 Requires:       rubygem(rails-api)
-Requires:       rubygem(occi-core) >= 4.2.16
-Requires:       rubygem(occi-core) < 4.3
+Requires:       rubygem(occi-core) >= 4.3.0
+Requires:       rubygem(occi-core) < 4.4
 Requires:       rubygem(rack-cors)
 Requires:       rubygem(warden) >= 1.2.3
 Requires:       rubygem(%{openssl_cms})
@@ -82,8 +79,8 @@ Documentation for %{name}.
 %package ec2
 Summary:        Amazon backend for %{gem_name}
 BuildArch:      noarch
-Requires:       rubygem(aws-sdk-core) >= 2.0.0-0.rc16
-Requires:       rubygem(aws-sdk-core) < 2.0.1
+Requires:       rubygem(aws-sdk-core) >= 2.0.1
+Requires:       rubygem(aws-sdk-core) < 2.1
 Requires:       %{name} = %{version}-%{release}
 
 %description ec2
@@ -135,7 +132,6 @@ while read name ver; do
 done << EOF
 rails        4.0.0
 rails-api    0.1.0
-jbuilder     1.5.0
 passenger    4.0.18
 rspec-rails  2.14.0
 EOF
@@ -299,5 +295,5 @@ fi
 
 
 %changelog
-* Wed Sep 24 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1.20140918gitb11ad8c
+* Sat Oct 04 2014 František Dvořák <valtri@civ.zcu.cz> - 1.1.0-0.beta.2
 - Initial package
-- 
1.8.2.3