From bee5851fb0985cbe31515cd2addafec081809b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 2 May 2018 17:00:36 +0200
Subject: [PATCH] Make %gemspec_{add,remove}_dep modify .gemspec provided by
 %setup macro.

The macros need to be udpated, since RPM 4.14+ can expand .gem files and
also also provide %{gem_name}.gemspec file used to rebuild the gem.
However, the .gemspec file is not in current directory, but directly in
%{_builddir}.
---
 macros.rubygems | 4 ++--
 ruby.spec       | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros.rubygems b/macros.rubygems
index 0652ec6..2cb96a6 100644
--- a/macros.rubygems
+++ b/macros.rubygems
@@ -60,7 +60,7 @@ gem install \\\
 #
 %gemspec_add_dep(g:s:d) \
 read -d '' gemspec_add_dep_script << 'EOR' || : \
-  gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \
+  gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \
   \
   name = '%{-g*}' \
   requirements = %{*}%{!?1:nil} \
@@ -97,7 +97,7 @@ unset -v gemspec_add_dep_script \
 #
 %gemspec_remove_dep(g:s:d) \
 read -d '' gemspec_remove_dep_script << 'EOR' || : \
-  gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \
+  gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \
   \
   name = '%{-g*}' \
   requirements = %{*}%{!?1:nil} \
diff --git a/ruby.spec b/ruby.spec
index 3adeff0..bfde4a1 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -21,7 +21,7 @@
 %endif
 
 
-%global release 92
+%global release 93
 %{!?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
@@ -1068,6 +1068,9 @@ make check TESTS="-v $DISABLE_TESTS"
 %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
 
 %changelog
+* Wed May 02 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-93
+- Make %%gemspec_{add,remove}_dep modify .gemspec provided by %%setup macro.
+
 * Tue Apr 10 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-92
 - Conflict requirement needs to generate dependency.
 - Stop using --with-setjmp-type=setjmp on aarch64 (rhbz#1545239).