diff --git a/ruby.spec b/ruby.spec index 4ce9d64..60f56f5 100644 --- a/ruby.spec +++ b/ruby.spec @@ -58,14 +58,14 @@ %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') -%if 0%{?fedora} >= 19 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 19 %global with_rubypick 1 %endif Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version} -Release: %{release_string}.1 +Release: %{release_string}.2 Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ... # MIT and CCO: ccan/* @@ -130,7 +130,8 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Suggests: rubypick +# No rubypick in RHEL8 +# Suggests: rubypick Recommends: ruby(rubygems) >= %{rubygems_version} Recommends: rubygem(bigdecimal) >= %{bigdecimal_version} Recommends: rubygem(did_you_mean) >= %{did_you_mean_version} @@ -1022,6 +1023,9 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog +* Wed Mar 21 2018 Troy Dawson - 2.4.2-84.2 +- No rubypick in RHEL + * Tue Oct 24 2017 Troy Dawson - 2.4.2-84.1 - Cleanup spec file conditionals