From 16c9e1e6b0e402a074893ac835b32a41943fcd94 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jan 06 2016 12:35:09 +0000
Subject: Load RubyGems prior ABRT hook to properly rescue RubyGems exceptions.


---

diff --git a/abrt_prelude.rb b/abrt_prelude.rb
index 5ffc51d..587c6a6 100644
--- a/abrt_prelude.rb
+++ b/abrt_prelude.rb
@@ -1,4 +1,8 @@
-begin
-  require 'abrt'
-rescue LoadError
+if defined?(Gem)
+  require 'rubygems.rb'
+
+  begin
+    require 'abrt'
+  rescue LoadError
+  end
 end
diff --git a/ruby.spec b/ruby.spec
index 999130a..02783ab 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -21,7 +21,7 @@
 %endif
 
 
-%global release 50
+%global release 51
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory three, since the
@@ -630,8 +630,9 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 # the test suite).
 touch abrt.rb
 
-# Check if abrt hook is required.
-make runruby TESTRUN_SCRIPT=%{SOURCE12}
+# Check if abrt hook is required (RubyGems are disabled by default when using
+# runruby, so re-enable them).
+make runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE12}"
 
 # Check if systemtap is supported.
 make runruby TESTRUN_SCRIPT=%{SOURCE13}
@@ -939,6 +940,9 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Wed Jan 06 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-51
+- Load RubyGems prior ABRT hook to properly rescue RubyGems exceptions.
+
 * Mon Jan 04 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-50
 - Upgrade to Ruby 2.3.0.
 - Move gemified net-telnet into subpackage.