From d66ece5f5d4103074cf7de0e0dbf14b19ace0137 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jan 24 2019 09:38:43 +0000
Subject: Properly generate "ruby(rubygems)" versioned dependencies.


---

diff --git a/ruby.spec b/ruby.spec
index ec1eea7..55db047 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -21,7 +21,7 @@
 %endif
 
 
-%global release 110
+%global release 111
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -1186,6 +1186,9 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{_mandir}/man5/gemfile.5*
 
 %changelog
+* Thu Jan 24 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.0-111
+- Properly generate versioned ruby(rubygems) dependencies.
+
 * Thu Jan 17 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.0-110
 - Upgrade to Ruby 2.6.0.
 
diff --git a/rubygems.req b/rubygems.req
index d75247d..bc38f66 100644
--- a/rubygems.req
+++ b/rubygems.req
@@ -42,11 +42,14 @@ module RubyGemsReq
 
   # Report RubyGems dependency, versioned if required.
   def self.rubygems_dependency(specification)
-    Helpers::requirement_versions_to_rpm(specification.required_rubygems_version).each do |requirement|
-      dependency_string = "ruby(rubygems)"
-      dependency_string += " #{specification.required_rubygems_version}" if requirement&.length > 0
-      puts dependency_string
+    dependency_strings = Helpers::requirement_versions_to_rpm(specification.required_rubygems_version).map do |requirement|
+      requirement_string = "ruby(rubygems)"
+      requirement_string += " #{requirement}" if requirement&.length > 0
+      requirement_string
     end
+    dependency_string = dependency_strings.join(' with ')
+    dependency_string.prepend('(').concat(')') if dependency_strings.length > 1
+    puts dependency_string
   end
 
   # Report all gem dependencies including their version.