From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 4 Oct 2014 11:04:36 +0000 (+0200)
Subject: Passenger gem doesn't exist anymore.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8dae5f06fe4c28b64b04221231d7a1b1b94d688d;p=rOCCI-packaging-fedora.git

Passenger gem doesn't exist anymore.
---

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 9f6ea27..537ef51 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -10,6 +10,13 @@
 %global openssl_cms openssl_cms_2_1
 %endif
 
+# passenger gem not in upstream and not needed anymore
+%if 0%{?fedora} && 0%{?fedora} <= 21 || 0%{?rhel} && 0%{?rhel} <= 7
+%global rubygem_passenger 1
+%else
+%global rubygem_passenger 0
+%endif
+
 Name:           rOCCI-server
 Version:        1.1.0
 Release:        0.beta.2%{?dist}
@@ -45,7 +52,6 @@ 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.2
 Requires:       rubygem(rails-api)
@@ -54,6 +60,9 @@ Requires:       rubygem(occi-core) < 4.4
 Requires:       rubygem(rack-cors)
 Requires:       rubygem(warden) >= 1.2.3
 Requires:       rubygem(%{openssl_cms})
+%if %{?rubygem_passenger}
+Requires:       rubygem(passenger)
+%endif
 %if 0%{?fedora} && 0%{?fedora} <= 20 || 0%{?rhel} && 0%{?rhel} <= 7
 Requires:       ruby(release)
 Requires:       ruby(rubygems)
@@ -126,6 +135,9 @@ cp -p lib/backends/bundles/Gemfile.opennebula Gemfile.opennebula.upstream
 cp -p lib/backends/bundles/Gemfile.ec2 Gemfile.ec2.upstream
 # jbuilder still needed
 sed -i "s/#\(\s*gem ['\"]jbuilder['\"]\)/\1/" Gemfile
+%if ! %{?rubygem_passenger}
+sed -i "s/^\(\s*gem ['\"]passenger['\"].*\)/#disabled: \1/" Gemfile
+%endif
 # relax upstream requirements
 while read name ver file; do
   file=${file:-'Gemfile'}