#57 Bundle did_you_mean
Merged 4 years ago by vondruch. Opened 4 years ago by vondruch.
rpms/ vondruch/ruby bundle-dym  into  master

file modified
+11 -28
@@ -22,7 +22,7 @@ 

  %endif

  

  

- %global release 129

+ %global release 130

  %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}

  

  # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -162,7 +162,6 @@ 

  Recommends: rubygem(bigdecimal) >= %{bigdecimal_version}

  # Change this to requires, hopefully just as temporary measure.

  # https://bugs.ruby-lang.org/issues/16431

- Requires: rubygem(did_you_mean) >= %{did_you_mean_version}

  Recommends: rubygem(openssl) >= %{openssl_version}

  

  BuildRequires: autoconf
@@ -220,6 +219,7 @@ 

  Provides: bundled(ccan-list)

  

  # StdLib default gems.

+ Provides: bundled(rubygem-did_you_mean) = %{did_you_mean_version}

  Provides: bundled(rubygem-racc) = %{racc_version}

  

  # Tcl/Tk support was removed from stdlib in Ruby 2.4, i.e. F27 timeframe
@@ -279,7 +279,8 @@ 

  Requires:   ruby(rubygems) >= %{rubygems_version}

  Supplements: ruby(rubygems)

  # Obsoleted by Ruby 2.7 in F32 timeframe.

- Obsoletes: rubygem-racc < %{racc_version}-%{release}

+ Obsoletes: rubygem-did_you_mean < 1.4.0-130

+ Obsoletes: rubygem-racc < 1.4.16-130

  BuildArch:  noarch

  

  %description default-gems
@@ -356,20 +357,6 @@ 

  conversion between base 10 and base 2.

  

  

- %package -n rubygem-did_you_mean

- Summary:    "Did you mean?" experience in Ruby

- Version:    %{did_you_mean_version}

- License:    MIT

- Requires:   ruby(release)

- Requires:   ruby(rubygems) >= %{rubygems_version}

- Provides:   rubygem(did_you_mean) = %{version}-%{release}

- BuildArch:  noarch

- 

- %description -n rubygem-did_you_mean

- "did you mean?" experience in Ruby: the error message will tell you the right

- one when you misspelled something.

- 

- 

  %package -n rubygem-io-console

  Summary:    IO/Console is a simple console utilizing library

  Version:    %{io_console_version}
@@ -699,11 +686,6 @@ 

  mv %{buildroot}%{ruby_libdir}/bundler %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib

  mv %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec %{buildroot}%{gem_dir}/specifications

  

- mkdir -p %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib

- mv %{buildroot}%{ruby_libdir}/did_you_mean.rb %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib

- mv %{buildroot}%{ruby_libdir}/did_you_mean %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib

- mv %{buildroot}%{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec %{buildroot}%{gem_dir}/specifications

- 

  mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib

  mkdir -p %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io

  mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
@@ -1090,6 +1072,7 @@ 

  %{ruby_libarchdir}/zlib.so

  

  # Default gems

+ %{ruby_libdir}/did_you_mean*

  %{ruby_libdir}/racc*

  %dir %{ruby_libarchdir}/racc

  %{ruby_libarchdir}/racc/cparse.so
@@ -1131,6 +1114,7 @@ 

  %{gem_dir}/specifications/default/date-3.0.0.gemspec

  %{gem_dir}/specifications/default/dbm-1.1.0.gemspec

  %{gem_dir}/specifications/default/delegate-0.1.0.gemspec

+ %{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec

  %{gem_dir}/specifications/default/etc-1.1.0.gemspec

  %{gem_dir}/specifications/default/fcntl-1.0.0.gemspec

  %{gem_dir}/specifications/default/fiddle-1.0.0.gemspec
@@ -1149,6 +1133,7 @@ 

  %{gem_dir}/specifications/default/ostruct-0.2.0.gemspec

  %{gem_dir}/specifications/default/prime-0.1.1.gemspec

  %{gem_dir}/specifications/default/pstore-0.1.0.gemspec

+ %{gem_dir}/specifications/default/racc-%{racc_version}.gemspec

  %{gem_dir}/specifications/default/readline-0.0.2.gemspec

  %{gem_dir}/specifications/default/readline-ext-0.1.0.gemspec

  %{gem_dir}/specifications/default/reline-0.1.3.gemspec
@@ -1176,7 +1161,6 @@ 

  %exclude %{_bindir}/{racc2y,y2racc}

  %exclude %{gem_dir}/gems/racc-%{racc_version}/bin/{racc2y,y2racc}

  %{gem_dir}/gems/racc-%{racc_version}

- %{gem_dir}/specifications/default/racc-1.4.16.gemspec

  

  %files -n rubygem-irb

  %{_bindir}/irb
@@ -1205,11 +1189,6 @@ 

  %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}

  %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec

  

- %files -n rubygem-did_you_mean

- %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}

- %exclude %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/.*

- %{gem_dir}/specifications/did_you_mean-%{did_you_mean_version}.gemspec

- 

  %files -n rubygem-io-console

  %{ruby_libdir}/io

  %{ruby_libarchdir}/io/console.so
@@ -1287,6 +1266,10 @@ 

  

  

  %changelog

+ * Wed Apr 08 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-130

+ - Bundle did_you_mean into StdLib.

+   Resolves: rhbz#1817178

+ 

  * Thu Apr 02 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-129

  - Add ruby-default-gems subpackage shipping all extra default gem content.

  - Bundle Racc into StdLib.

This aims to resolve rhbz#1817178

There is also small commit changing .gemspec position in file list, but that is just minor nit.

This part

# Obsoleted by Ruby 2.7 in F32 timeframe.
Obsoletes: rubygem-did_you_mean < %{did_you_mean_version}-%{release}
Obsoletes: rubygem-racc < %{racc_version}-%{release}

could be hardcorded like this? Because for example, when we have rawhide as F34, above code obsoletes by Ruby X.Y in F33 timeframe.

# Obsoleted by Ruby 2.7 in F32 timeframe.
Obsoletes: rubygem-did_you_mean < 1.4.0-130
Obsoletes: rubygem-racc < 1.4.16-129

I confirmed following steps works with both regular and root user.

$ cat > Gemfile <<EOF
source "https://rubygems.org"

gem "nio4r", "= 2.5.2"
EOF

$ bundle install --path=vendor/bundle

Other parts look good to me!

This part

Obsoleted by Ruby 2.7 in F32 timeframe.

Obsoletes: rubygem-did_you_mean < %{did_you_mean_version}-%{release}
Obsoletes: rubygem-racc < %{racc_version}-%{release}

could be hardcorded like this? Because for example, when we have rawhide as F34, above code obsoletes by Ruby X.Y in F33 timeframe.

Obsoleted by Ruby 2.7 in F32 timeframe.

Obsoletes: rubygem-did_you_mean < 1.4.0-130
Obsoletes: rubygem-racc < 1.4.16-129

You are probably right. Considering we have independent rubygem-racc package, it could obsolete something we don't really want. I'll change it.

2 new commits added

  • Hardcode obsolete version for rubygem-racc.
  • Hardcode obsolete version for rubygem-did_you_mean.
4 years ago

Pull-Request has been merged by vondruch

4 years ago