From 473a8c1c50567c89fa1c454d08ef57171f12f9bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 16 Sep 2014 00:38:42 +0200 Subject: [PATCH] Update explicit requires patch and comment its status. --- rOCCI-server.spec | 1 + rocci-server-requires.diff | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/rOCCI-server.spec b/rOCCI-server.spec index 18e141d..be202a1 100644 --- a/rOCCI-server.spec +++ b/rOCCI-server.spec @@ -23,6 +23,7 @@ Source5: %{name}.target # (not intended for upstream) Patch0: rocci-server-unbundle.diff # missing requires in code (needed when bundler is not used) +# https://github.com/EGI-FCTF/rOCCI-server/pull/55 Patch1: rocci-server-requires.diff BuildArch: noarch diff --git a/rocci-server-requires.diff b/rocci-server-requires.diff index a8b5339..39bfa07 100644 --- a/rocci-server-requires.diff +++ b/rocci-server-requires.diff @@ -1,4 +1,8 @@ -Missing requires needed without bundler. +commit b695e2bad951a1ed051ae78bde50cbb8811fbec4 +Author: František Dvořák +Date: Tue Sep 16 00:25:08 2014 +0200 + + Requires needed when bundler is not used. diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 980305c..5d4a179 100644 @@ -71,3 +75,15 @@ index a445104..dcd3caf 100644 module ROCCIServer VERSION = '1.0.5' ROCCI_VERSION = ::Occi::VERSION +diff --git a/lib/backends/opennebula/authn/cloud_auth_client.rb b/lib/backends/opennebula/authn/cloud_auth_client.rb +index a6674a2..2e2b480 100644 +--- a/lib/backends/opennebula/authn/cloud_auth_client.rb ++++ b/lib/backends/opennebula/authn/cloud_auth_client.rb +@@ -14,6 +14,7 @@ + # limitations under the License. # + #--------------------------------------------------------------------------- # + ++require 'opennebula' + require 'thread' + + module Backends::Opennebula::Authn -- 1.8.2.3