From e826ff6658aab409e8b32e677ecabcbe07e93de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 20 Oct 2016 13:55:21 +0200
Subject: [PATCH] Add gemspec_add_dep and gemspec_remove_dep macros.

---
 macros.rubygems | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 ruby.spec       |  5 +++-
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/macros.rubygems b/macros.rubygems
index 6d99ac3..8218ec9 100644
--- a/macros.rubygems
+++ b/macros.rubygems
@@ -34,3 +34,81 @@ gem install \\\
 %rubygems_default_filter %{expand: \
 %global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_from}|}^%{gem_extdir_mri}/.*\\\\.so$ \
 }
+
+# The 'read' command in gemspec_add _depand gemspec_remove_dep macros is not
+# essential, but it is usefull to make the sript appear in build log.
+
+# Add dependency named gem with version requirements to .gemspec. It adds
+# runtime dependency by default.
+# -g<gem>            Specifies name of the gem dependency.
+# -s<gemspec_file>   Overrides the default .gemspec location.
+# -d                 Add development dependecy.
+#
+# The remaining arguments are expected to be version requirements and should
+# be valid Ruby code.
+%gemspec_add_dep(g:s:d) \
+read -d '' gemspec_add_dep_script << 'EOR' || : \
+  gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \
+  \
+  name = '%{-g*}' \
+  requirements = %{*}%{!?1:nil} \
+  \
+  type = :%{!?-d:runtime}%{?-d:development} \
+  \
+  spec = Gem::Specification.load(gemspec_file) \
+  abort("#{gemspec_file} is not accessible.") unless spec \
+  \
+  dep = spec.dependencies.detect { |d| d.type == type && d.name == name } \
+  if dep \
+    dep.requirement.concat requirements \
+  else \
+    spec.public_send "add_#{type}_dependency", name, requirements \
+  end \
+  File.write gemspec_file, spec.to_ruby \
+EOR\
+echo "$gemspec_add_dep_script" | ruby \
+unset -v gemspec_add_dep_script \
+%{nil}
+
+# Remove dependency named gem with version requirements to .gemspec. It
+# removes runtime dependency by default.
+# -g<gem>            Specifies name of the gem dependency.
+# -s<gemspec_file>   Overrides the default .gemspec location.
+# -d                 Remove development dependecy.
+#
+# The remaining arguments are expected to be version requirements and should
+# be valid Ruby code. The macro fails if these specific requirements can't be
+# removed.
+%gemspec_remove_dep(g:s:d) \
+read -d '' gemspec_remove_dep_script << 'EOR' || : \
+  gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \
+  \
+  name = '%{-g*}' \
+  requirements = %{*}%{!?1:nil} \
+  \
+  type = :%{!?-d:runtime}%{?-d:development} \
+  \
+  spec = Gem::Specification.load(gemspec_file) \
+  abort("#{gemspec_file} is not accessible.") unless spec \
+  \
+  dep = spec.dependencies.detect { |d| d.type == type && d.name == name } \
+  if dep \
+    if requirements \
+      requirements = Gem::Requirement.create(requirements).requirements \
+      requirements.each do |r| \
+        unless dep.requirement.requirements.reject! { |dependency_requirements| dependency_requirements == r } \
+          abort("Requirement '#{r.first} #{r.last}' was not possible to remove for dependency '#{dep}'!") \
+        end \
+      end \
+      spec.dependencies.delete dep if dep.requirement.requirements.empty? \
+    else \
+      spec.dependencies.delete dep \
+    end \
+  else \
+    abort("Dependency '#{name}' was not found!") \
+  end \
+  File.write gemspec_file, spec.to_ruby \
+EOR\
+echo "$gemspec_remove_dep_script" | ruby \
+unset -v gemspec_remove_dep_script \
+%{nil}
diff --git a/ruby.spec b/ruby.spec
index e75c0c8..b3400fa 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -21,7 +21,7 @@
 %endif
 
 
-%global release 57
+%global release 60
 %{!?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
@@ -958,6 +958,9 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Fri Oct 21 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-60
+- Add gemspec_add_dep and gemspec_remove_dep macros.
+
 * Tue Jul 12 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-57
 - Make symlinks for json gem.