From 7fb860c8916439ae64fd3455cee13664cee19efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 2 Jan 2018 14:23:07 +0100
Subject: [PATCH] Restructure Molinillo version check a bit.

---
 ruby.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruby.spec b/ruby.spec
index b8a6afb..8919ddb 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -220,7 +220,6 @@ Requires:   rubygem(psych) >= %{psych_version}
 Provides:   gem = %{version}-%{release}
 Provides:   ruby(rubygems) = %{version}-%{release}
 # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
-Provides:   bundled(rubygem(molinillo)) = %{molinillo_version}
 Provides:   bundled(rubygem-molinillo) = %{molinillo_version}
 BuildArch:  noarch
 
@@ -708,12 +707,19 @@ checksec -f libruby.so.%{ruby_version} | \
   grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*Yes.*\d*.*\d*.*libruby.so.%{ruby_version}"
 %endif
 
-# Check RubyGems version correctness.
+# Check RubyGems version.
 [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ]
-# Check Molinillo version correctness.
-[ "`make runruby TESTRUN_SCRIPT=\"-e \\\"module Gem; module Resolver; end; end; require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'; puts Gem::Resolver::Molinillo::VERSION\\\"\" | tail -1`" \
+
+# Check Rubygems bundled dependencies versions.
+
+# Molinillo.
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
+  module Gem; module Resolver; end; end; \
+  require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'; \
+  puts Gem::Resolver::Molinillo::VERSION\\\"\" | tail -1`" \
   == '%{molinillo_version}' ]
 
+
 # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
 # when abrt.rb cannot be required (seems to be easier way then customizing
 # the test suite).