From d7dc7fa27c07e13aa5642a913668f10b4e94bca0 Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>
Date: Thu, 11 Feb 2021 11:28:40 +0100
Subject: [PATCH] ruby remove rubypick

Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>
---
 SPECS/ruby.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 01b90feb..175a47ba 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -23,7 +23,8 @@
 
 
 %global release 137
-%{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
+%define release_string %{release}%{dist}
+
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
@@ -174,7 +175,7 @@ Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
 Patch20: ruby-3.0.0-preview1-Enable-arm64-optimizations-that-exist-for-power-x86.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: rubypick
+#Requires: rubypick
 Requires: ruby(rubygems) >= %{rubygems_version}
 Requires: rubygem(bigdecimal) >= %{bigdecimal_version}
 # Change this to requires, hopefully just as temporary measure.
@@ -673,7 +674,7 @@ mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
 cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
 
 # Move gems root into common direcotry, out of Ruby directory structure.
-mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
+#mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
 
 # Create folders for gem binary extensions.
 # TODO: These folders should go into rubygem-filesystem but how to achieve it,
@@ -1177,12 +1178,14 @@ MSPECOPTS="$MSPECOPTS -P 'File.lchmod changes the file mode of the link and not
 # executable in both packages might possibly cause conflicts. The situation
 # could be better if Ruby generated these files:
 # https://github.com/ruby/ruby/pull/2545
-%exclude %{_bindir}/racc
+%{_bindir}/racc
 # These have wrong shebangs. Exclude them for now and let's see what upstream
 # thinks about them.
 # https://bugs.ruby-lang.org/issues/15982
-%exclude %{_bindir}/{racc2y,y2racc}
-%exclude %{gem_dir}/gems/racc-%{racc_version}/bin/{racc2y,y2racc}
+%{_bindir}/racc2y
+%{_bindir}/y2racc
+%exclude %{gem_dir}/gems/racc-%{racc_version}/bin/racc2y
+%exclude %{gem_dir}/gems/racc-%{racc_version}/bin/y2racc
 %{gem_dir}/gems/racc-%{racc_version}
 
 %files -n rubygem-irb