From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 27 Nov 2014 22:21:27 +0000 (+0100)
Subject: Update to 1.1.5.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=cd785032bfb72d8c619829a12b370dbf2bddc0c4;p=rOCCI-packaging-fedora.git

Update to 1.1.5.
---

diff --git a/README.Fedora b/README.Fedora
index e7802f1..3e46871 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -24,10 +24,7 @@ Testing
 Requirements:
 
   rOCCI-server-tests
-  rubygem(bundler)
-  rubygem(guard-test)
-  rubygem(rspec-rails) < 3
-  rubygem(simplecov)
+  rubygem(guard-test)  # not in Fedora (2014)
 
 Launch:
 
diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index e19ad7d..d7838c6 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 3b1909ff57f28ad1932e370c92e0c730477756e9
 
 %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.1.5
+Release:        1%{?dist}
 Summary:        Ruby OCCI Server
 
 License:        ASL 2.0
@@ -47,7 +47,7 @@ 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.3.2
 Requires:       rubygem(occi-core) < 4.4
 Requires:       rubygem(rack-cors)
 Requires:       rubygem(warden) >= 1.2.3
@@ -78,18 +78,28 @@ Documentation for %{name}.
 %package test
 Summary:        Tests for %{name}
 BuildArch:      noarch
+Requires:       rubygem(bundler)
+#Requires:       rubygem(guard-test) # not in Fedora
+#Requires:       rubygem(rspec-rails) # >= 3 required?
+#Requires:       rubygem(simplecov)   # really needed?
 Requires:       %{name}-ec2 = %{version}-%{release}
 Requires:       %{name}-opennebula = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 
-%description doc
-Tests for %{name}.
+%description test
+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 contains tests for OCCI server.
 
 
 %package ec2
 Summary:        Amazon backend for %{gem_name}
 BuildArch:      noarch
-Requires:       rubygem(aws-sdk-core) >= 2.0.1
+Requires:       rubygem(aws-sdk-core) >= 2.0.7
 Requires:       rubygem(aws-sdk-core) < 2.1
 Requires:       %{name} = %{version}-%{release}
 
@@ -144,11 +154,11 @@ rspec-rails  2.14.0
 opennebula   4.4.0   lib/backends/bundles/Gemfile.opennebula
 EOF
 # gems not needed for tests
-for p in sdoc capistrano rvm-capistrano debugger whenever passenger fuubar pry-rails pry-rescue pry-stack_explorer guard-bundler guard-rails rb-inotify libnotify yard redcarpet bond hirb; do
+for p in sdoc capistrano rvm-capistrano debugger whenever passenger rake fuubar pry-rails pry-rescue pry-stack_explorer guard-bundler guard-rails rb-inotify libnotify yard redcarpet bond hirb; do
   sed -i "s/^\(\s*gem ['\"]$p['\"].*\)/#disabled: \1/" Gemfile
 done
 # logstasher and openssl_cms not from git
-sed -i "s/, git:.*//" Gemfile
+sed -i "s/, :git.*//" Gemfile
 echo 'gem "%{openssl_cms}"' > lib/authentication_strategies/bundles/Gemfile.keystone
 
 # but move away the prepared Gemfile
@@ -303,6 +313,9 @@ fi
 
 
 %changelog
+* Thu Nov 27 2014 František Dvořák <valtri@civ.zcu.cz> - 1.1.5-1
+- Release 1.1.5
+
 * Sat Oct 04 2014 František Dvořák <valtri@civ.zcu.cz> - 1.1.0-0.beta.2
 - Release 1.1.0.beta.2