From cad5a823b517d2a974ebb3dee33bd9dccbd12d5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 2 Dec 2014 12:54:48 +0100 Subject: [PATCH] Update tests subpackage. --- README.Fedora | 3 ++- rOCCI-server.spec | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.Fedora b/README.Fedora index 3e46871..9902789 100644 --- a/README.Fedora +++ b/README.Fedora @@ -24,7 +24,8 @@ Testing Requirements: rOCCI-server-tests - rubygem(guard-test) # not in Fedora (2014) + rubygem(guard-test) # not in Fedora (2014) + rubygem(rspec-rails) >= 3.1.0 # in Fedora >= 21 Launch: diff --git a/rOCCI-server.spec b/rOCCI-server.spec index d7838c6..1d4a951 100644 --- a/rOCCI-server.spec +++ b/rOCCI-server.spec @@ -75,25 +75,30 @@ Requires: %{name} = %{version}-%{release} Documentation for %{name}. -%package test +%package tests 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: rubygem(guard-test) +%if 0%{?fedora} && 0%{?fedora} <= 20 || 0%{?rhel} && 0%{?rhel} <= 7 +#Requires: rubygem(rspec-rails) >= 3.1.0 +%else +Requires: rubygem(rspec-rails) >= 3.1.0 +Requires: rubygem(rspec-rails) < 3.2 +%endif +Requires: rubygem(simplecov) Requires: %{name}-ec2 = %{version}-%{release} Requires: %{name}-opennebula = %{version}-%{release} Requires: %{name} = %{version}-%{release} -%description test +%description tests 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. +This package contains tests for OCCI server. See README.Fedora how to launch them. %package ec2 @@ -150,7 +155,6 @@ while read name ver file; do done << EOF rails 4.0.0 rails-api 0.1.0 -rspec-rails 2.14.0 opennebula 4.4.0 lib/backends/bundles/Gemfile.opennebula EOF # gems not needed for tests @@ -297,7 +301,7 @@ fi %{_pkgdocdir}/rdoc/ %{app_root}/README.md -%files test +%files tests %{app_root}/lib/backends/bundles/ %{app_root}/spec/ %{app_root}/test/ @@ -313,11 +317,8 @@ fi %changelog -* Thu Nov 27 2014 František Dvořák - 1.1.5-1 +* Tue Dec 02 2014 František Dvořák - 1.1.5-1 - Release 1.1.5 -* Sat Oct 04 2014 František Dvořák - 1.1.0-0.beta.2 -- Release 1.1.0.beta.2 - * Sat Oct 04 2014 František Dvořák - 1.0.5-1 - Initial package -- 1.8.2.3