From 57ee8182502ab1e05abc5290ebda055d7c85b761 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Mon, 10 Jun 2019 15:10:44 +0200
Subject: [PATCH] Update to Module Ruby 2.6, by merging Fedora 2.6 branch.

Resolves: rhbz#1672575
Signed-off-by: Jun Aruga <jaruga@redhat.com>
---
 README.md |  9 ---------
 ruby.yaml | 26 +++++++++-----------------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index ca416cb..0000000
--- a/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# modules/ruby
-
-## Current status
-
-This module is not available yet.
-
-See this Bugzilla ticket to check the status.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1490285
diff --git a/ruby.yaml b/ruby.yaml
index 4bcc0d0..9abecca 100644
--- a/ruby.yaml
+++ b/ruby.yaml
@@ -11,7 +11,7 @@ data:
         object-oriented programming.  It has many features to process text
         files and to do system management tasks (as in Perl).  It is simple,
         straight-forward, and extensible.
-    stream: 2.5
+    stream: 2.6
     license:
         module:
             - MIT
@@ -32,44 +32,37 @@ data:
                 rationale: An interpreter of object-oriented scripting language
                 multilib: [x86_64]
                 buildorder: 101
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
             rubygem-abrt:
                 # From rubygem-abrt.spec Summary
                 rationale: >-
                     ABRT support for Ruby
                 buildorder: 102
-                ref: stream-ruby-2.5-rhel-8.1.0
-            rubygem-bundler:
-                # From rubygem-bundler.spec Summary
-                rationale: >-
-                    Library and utilities to manage a Ruby application's gem
-                    dependencies
-                buildorder: 102
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
             rubygem-mysql2:
                 # From rubygem-mysql2.spec Summary
                 rationale: >-
                     A simple, fast Mysql library for Ruby, binding to libmysql
                 buildorder: 102
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
             rubygem-pg:
                 # From rubygem-pg.spec Summary
                 rationale: >-
                     A Ruby interface to the PostgreSQL RDBMS
                 buildorder: 102
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
             rubygem-bson:
                 # From rubygem-bson.spec Summary
                 rationale: >-
                     Ruby Implementation of the BSON specification
                 buildorder: 102
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
             rubygem-mongo:
                 # From rubygem-mongo.spec Summary
                 rationale: >-
                     Ruby driver for MongoDB
                 buildorder: 103
-                ref: stream-ruby-2.5-rhel-8.1.0
+                ref: stream-ruby-2.6-rhel-8.1.0
     buildopts:
         rpms:
             macros: |
@@ -81,13 +74,14 @@ data:
             # From ruby.spec
             - ruby
             - ruby-devel
-            - ruby-irb
             - ruby-libs
             - rubygems
             - rubygems-devel
             - rubygem-bigdecimal
+            - rubygem-bundler
             - rubygem-did_you_mean
             - rubygem-io-console
+            - rubygem-irb
             - rubygem-json
             - rubygem-minitest
             - rubygem-net-telnet
@@ -100,8 +94,6 @@ data:
             - rubygem-xmlrpc
             # From rubygem-abrt.spec
             - rubygem-abrt
-            # From rubygem-bundler.spec
-            - rubygem-bundler
             # From rubygem-mysql2.spec
             - rubygem-mysql2
             # From rubygem-pg.spec