From 62d58423b2e903b270c369447e762eb472fa029f Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Wed, 12 Nov 2014 13:44:37 +0100
Subject: [PATCH] bug #3295: install net-ldap < 0.9 with ruby 1.8.7

(cherry picked from commit 1355c28734bcab3d67a70df093bf68473d52c78a)
---
 share/install_gems/install_gems | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems
index da10fb67ed..b42cef33f7 100755
--- a/share/install_gems/install_gems
+++ b/share/install_gems/install_gems
@@ -12,9 +12,11 @@ end
 
 if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0'
     $nokogiri='nokogiri --version "< 1.6.0"'
+    LDAP='net-ldap --version "< 0.9"'
 else
     $nokogiri='nokogiri'
     DEFAULT = DEFAULT_PRE + %w{hybrid}
+    LDAP='net-ldap'
 end
 
 DEFAULT = DEFAULT_PRE if !defined?(DEFAULT)
@@ -24,7 +26,7 @@ GROUPS={
     :sunstone   => ['json', 'rack', 'sinatra', 'thin', 'zendesk_api', SQLITE],
     :cloud      => %w{amazon-ec2 rack sinatra thin uuidtools curb json},
     :hybrid     => %w{softlayer_api configparser azure},
-    :auth_ldap  => 'net-ldap',
+    :auth_ldap  => LDAP,
     :vmware     => %w{builder trollop},
     :oneflow    => %w{sinatra json treetop parse-cron},
     :ec2_hybrid => 'aws-sdk --version "= 1.33"',
@@ -35,7 +37,7 @@ GROUPS={
 PACKAGES=GROUPS.keys
 
 GEM_TEST={
-    'net-ldap' => 'net/ldap'
+    LDAP => 'net/ldap'
 }
 
 DISTRIBUTIONS={