From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 4 Oct 2014 12:16:22 +0000 (+0200)
Subject: Try to remove gem passenger dependency for all branches.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=94e4ea3402c5f737b16e945fe21453be3a8dda70;p=rOCCI-packaging-fedora.git

Try to remove gem passenger dependency for all branches.
---

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 537ef51..0fe74b5 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -10,13 +10,6 @@
 %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}
@@ -60,9 +53,6 @@ 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)
@@ -135,9 +125,6 @@ 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'}
@@ -146,12 +133,11 @@ done << EOF
 jbuilder     1.5.0
 rails        4.0.0
 rails-api    0.1.0
-passenger    4.0.18
 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 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 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