valtri pushed to rOCCI-server (master). "Enable Opennebula backend."

[notifications at fedoraproject.org]

>From e3dc838bdf0724a80c71f72ab03e212aa6aa6847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri at civ.zcu.cz>
Date: Sun, 29 Mar 2015 18:38:28 +0200
Subject: Enable Opennebula backend.


diff --git a/README.Fedora b/README.Fedora
index 579d84c..ecfb669 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -28,8 +28,8 @@ Testing
 Requirements:
 
   rOCCI-server-tests
-  rubygem(guard-test)            # not in Fedora (2015)
-  rubygem(rspec-rails) >= 3.2.0  # old in Fedora (2015)
+  rubygem(guard-test)            # not in Fedora (2016)
+  rubygem(rspec-rails) >= 3.2.0  # in Fedora >= 23
 
 Launch:
 
diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 67ac55e..ebe2bd5 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -9,7 +9,7 @@
 
 Name:           rOCCI-server
 Version:        1.1.6
-Release:        1.20150217git%{shortcommit}%{?dist}
+Release:        2.20150217git%{shortcommit}%{?dist}
 Summary:        Ruby OCCI Server
 
 License:        ASL 2.0
@@ -82,12 +82,13 @@ Summary:        Tests for %{name}
 BuildArch:      noarch
 Requires:       rubygem(bundler)
 #Requires:       rubygem(guard-test)
-#Requires:       rubygem(rspec-rails) >= 3.2.0
-#Requires:       rubygem(rspec-rails) < 3.3
+%if ! 0%{?fedora} || 0%{?fedora} >= 23
+Requires:       rubygem(rspec-rails) >= 3.2.0
+Requires:       rubygem(rspec-rails) < 3.3
+%endif
 Requires:       rubygem(simplecov)
 Requires:       %{name}-ec2 = %{version}-%{release}
-# TODO: ox required
-#Requires:       %{name}-opennebula = %{version}-%{release}
+Requires:       %{name}-opennebula = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 
 %description tests
@@ -101,23 +102,22 @@ This package contains tests for OCCI server. See README.Fedora how to launch
 them.
 
 
-# TODO: ox required (https://bugzilla.redhat.com/show_bug.cgi?id=1142491)
-#%package opennebula
-#Summary:        Opennebula backend for %{gem_name}
-#BuildArch:      noarch
-#Requires:       rubygem(erubis)
-#Requires:       rubygem(opennebula) >= 4.4.0
-#Requires:       rubygem(ox)
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description opennebula
-#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 Opennebula backend for OCCI server.
+%package opennebula
+Summary:        Opennebula backend for %{gem_name}
+BuildArch:      noarch
+Requires:       rubygem(erubis)
+Requires:       rubygem(opennebula) >= 4.4.0
+Requires:       rubygem(ox)
+Requires:       %{name} = %{version}-%{release}
+
+%description opennebula
+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 Opennebula backend for OCCI server.
 
 
 %package ec2
@@ -225,10 +225,6 @@ install -p -m 0644 examples/etc/apache2/sites-available/occi-ssl %{buildroot}%{_
 echo "Listen 11443" >>  %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-listen.conf
 install -p -m 0644 examples/etc/apache2/conf.d/security %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-security.conf
 
-# don't test opennebula backend for now
-# TODO: ox required
-rm -f %{buildroot}%{app_root}/spec/lib/backends/opennebula_backend_spec.rb
-
 
 # Testsuite requires running server
 #%%check
@@ -301,9 +297,6 @@ fi
 %exclude %{app_root}/Capfile
 %exclude %{app_root}/Guardfile
 %exclude %{app_root}/Rakefile
-# TODO: ox required
-%exclude %{app_root}/lib/backends/opennebula/
-%exclude %{app_root}/lib/backends/opennebula_backend.rb
 
 %files doc
 %{_pkgdocdir}/rdoc/
@@ -320,12 +313,15 @@ fi
 %{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
+%files opennebula
+%{app_root}/lib/backends/opennebula/
+%{app_root}/lib/backends/opennebula_backend.rb
 
 
 %changelog
+* Sun Mar 29 2015 František Dvořák <valtri at civ.zcu.cz> - 1.1.6-2.20150217git73409ea
+- Enable Opennebula backend
+
 * Tue Feb 17 2015 František Dvořák <valtri at civ.zcu.cz> - 1.1.6-1.20150217git73409ea
 - Update to 1.1.6
 - New Amazon EC2 backend
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rOCCI-server.git/commit/?h=master&id=e3dc838bdf0724a80c71f72ab03e212aa6aa6847