From ec47f9eca72b0eb990ed87c785d3bac1d660bf78 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Apr 08 2016 10:23:37 +0000
Subject: Explicitly set rubygem(bigdecimal) dependency.


---

diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec
index a5858e2..2de3469 100644
--- a/rubygem-activesupport.spec
+++ b/rubygem-activesupport.spec
@@ -4,7 +4,7 @@ Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gem_name}
 Epoch: 1
 Version: 4.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -27,16 +27,9 @@ Patch1: activesupport-tests-fix.patch
 # See https://github.com/rails/rails/pull/19625
 Patch2: activesupport-4.2.1-run-out-of-rails-git.patch
 
-# We need to add the bigdecimal dependency to gemspec, otherwise it won't be
-# loaded. The reason for this is unbundling it from ruby libdir and moving
-# it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
-#
-# => This has been resolved with symlinks in Fedora for now as we failed so far to
-# add this dependency to upstream due to JRuby.
-#
-# https://bugzilla.redhat.com/show_bug.cgi?id=829209
-# https://bugs.ruby-lang.org/issues/6590
-Patch4: activesupport-add-bigdecimal-dependency.patch
+# ruby package has just soft dependency on rubygem(bigdecimal), while
+# ActiveSupport always requires it.
+Requires: rubygem(bigdecimal)
 
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 BuildRequires: rubygems-devel
@@ -70,10 +63,6 @@ pushd .%{gem_instdir}
 %patch2 -p2
 popd
 
-pushd .%{gem_dir}
-#%%patch4 -p1
-popd
-
 %build
 
 %install
@@ -101,6 +90,9 @@ popd
 
 
 %changelog
+* Fri Apr 08 2016 Vít Ondruch <vondruch@redhat.com> - 1:4.2.6-2
+- Explicitly set rubygem(bigdecimal) dependency.
+
 * Tue Mar 08 2016 Pavel Valena <pvalena@redhat.com> - 1:4.2.6-1
 - Update to activesupport 4.2.6