|
@@ -1,8 +1,9 @@
|
|
|
%bcond_without test
|
|
|
+%bcond_with json
|
|
|
|
|
|
%global major_version 2
|
|
|
%global minor_version 6
|
|
|
-%global teeny_version 5
|
|
|
+%global teeny_version 6
|
|
|
|
|
|
%global major_minor_version %{major_version}.%{minor_version}
|
|
|
|
|
@@ -23,26 +24,37 @@
|
|
|
%global gem_extdir %{_libdir}/gems
|
|
|
%global gem_extdirs %{_exec_prefix}/lib{,64}/gems
|
|
|
|
|
|
+# lib/bundler
|
|
|
%global bundler_version 1.17.2
|
|
|
+# lib/fileutils
|
|
|
%global bundler_fileutils_version 1.1.0
|
|
|
+# lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
|
|
|
%global bundler_molinillo_version 0.6.6
|
|
|
+# lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
|
|
|
%global bundler_net_http_persistent_version 2.9.4
|
|
|
+# lib/bundler/vendor/thor/lib/thor
|
|
|
%global bundler_thor_version 0.20.0
|
|
|
|
|
|
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
|
|
|
# http://redmine.ruby-lang.org/issues/5313
|
|
|
%global irb_version %{ruby_version}
|
|
|
|
|
|
-%global rake_version 12.3.2
|
|
|
-%global rdoc_version 6.1.2
|
|
|
+# ext/bigdecimal
|
|
|
%global bigdecimal_version 1.4.1
|
|
|
+# ext/io/console
|
|
|
%global io_console_version 0.4.7
|
|
|
+# ext/json
|
|
|
%global json_version 2.1.0
|
|
|
-%global minitest_version 5.11.3
|
|
|
+# ext/psych
|
|
|
%global psych_version 3.1.0
|
|
|
+# gems
|
|
|
+%global minitest_version 5.11.3
|
|
|
%global power_assert_version 1.1.3
|
|
|
+%global rake_version 12.3.3
|
|
|
%global test_unit_version 3.2.9
|
|
|
%global xmlrpc_version 0.3.0
|
|
|
+# lib/rdoc
|
|
|
+%global rdoc_version 6.1.2
|
|
|
|
|
|
# Note:
|
|
|
# As seen on perl srpm, as this (ruby) srpm contains several sub-components,
|
|
@@ -52,7 +64,7 @@
|
|
|
#
|
|
|
# 全てのサブパッケージのバージョンが上がる場合を除き、rubyのmainバージョンが
|
|
|
# 更新されても1には戻さずに必ず+1してください。
|
|
|
-%global ruby_rel 1
|
|
|
+%global ruby_rel 2
|
|
|
|
|
|
%bcond_without emacsen
|
|
|
%define rbmode ruby-mode
|
|
@@ -127,7 +139,7 @@ Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
|
|
|
Patch3: ruby-2.1.0-always-use-i386.patch
|
|
|
# Allows to install RubyGems into custom directory, outside of Ruby's tree.
|
|
|
# http://bugs.ruby-lang.org/issues/5617
|
|
|
-Patch4: ruby-2.1.0-custom-rubygems-location.patch
|
|
|
+Patch4: ruby-2.6.6-custom-rubygems-location.patch
|
|
|
# Make mkmf verbose by default
|
|
|
Patch5: ruby-1.9.3-mkmf-verbose.patch
|
|
|
# Adds support for '--with-prelude' configuration option. This allows to built
|
|
@@ -325,7 +337,7 @@ License: GPLv2 and Ruby and MIT
|
|
|
Requires: ruby(release) = %{ruby_release}
|
|
|
Requires: ruby(rubygems) >= %{rubygems_version}
|
|
|
Requires: ruby(irb) = %{irb_version}
|
|
|
-Requires: rubygem(json) = %{json_version}
|
|
|
+Requires: rubygem(json) >= %{json_version}
|
|
|
Provides: rdoc = %{version}-%{release}
|
|
|
Provides: ri = %{version}-%{release}
|
|
|
Provides: rubygem(rdoc) = %{version}-%{release}
|
|
@@ -392,7 +404,7 @@ Provides: rubygem(io-console) = %{version}-%{release}
|
|
|
IO/Console provides very simple and portable access to console. It doesn't
|
|
|
provide higher layer features, such like curses and readline.
|
|
|
|
|
|
-
|
|
|
+%if %{with json}
|
|
|
%package -n rubygem-json
|
|
|
Summary: This is a JSON implementation as a Ruby extension in C
|
|
|
Version: %{json_version}
|
|
@@ -407,7 +419,7 @@ This is a implementation of the JSON specification according to RFC 4627.
|
|
|
You can think of it as a low fat alternative to XML, if you want to store
|
|
|
data to disk or transmit it over a network rather than use a verbose
|
|
|
markup language.
|
|
|
-
|
|
|
+%endif
|
|
|
|
|
|
%package -n rubygem-minitest
|
|
|
Summary: Minitest provides a complete suite of testing facilities.
|
|
@@ -733,6 +745,17 @@ sed -i '/^end$/ i\
|
|
|
sed -i '/^end$/ i\
|
|
|
s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
|
|
|
|
|
|
+%if !%{with json}
|
|
|
+pushd %{buildroot}
|
|
|
+rm -rf .%{ruby_libdir}/%{ruby_release}/json
|
|
|
+rm -rf .%{ruby_libarchdir}/%{ruby_release}/json
|
|
|
+rm -rf .%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}
|
|
|
+rm -rf .%{gem_dir}/%{ruby_release}/gems/json-%{json_version}
|
|
|
+rm -f .%{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
|
|
|
+popd
|
|
|
+%endif
|
|
|
+
|
|
|
+
|
|
|
%if %{with test}
|
|
|
%check
|
|
|
DISABLE_TESTS=""
|
|
@@ -972,14 +995,18 @@ fi
|
|
|
%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}
|
|
|
%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/bundler-%{bundler_version}
|
|
|
%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/io-console-%{io_console_version}
|
|
|
+%if %{with json}
|
|
|
%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/json-%{json_version}
|
|
|
+%endif
|
|
|
%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/psych-%{psych_version}
|
|
|
%exclude %{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}
|
|
|
%exclude %{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/bundler-%{bundler_version}.gemspec
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/io-console-%{io_console_version}.gemspec
|
|
|
+%if %{with json}
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
|
|
|
+%endif
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/rake-%{rake_version}.gemspec
|
|
|
%exclude %{gem_dir}/%{ruby_release}/specifications/rdoc-%{rdoc_version}.gemspec
|
|
@@ -1034,12 +1061,14 @@ fi
|
|
|
%{gem_dir}/%{ruby_release}/gems/io-console-%{io_console_version}
|
|
|
%{gem_dir}/%{ruby_release}/specifications/io-console-%{io_console_version}.gemspec
|
|
|
|
|
|
+%if %{with json}
|
|
|
%files -n rubygem-json
|
|
|
%{ruby_libdir}/%{ruby_release}/json
|
|
|
%{ruby_libarchdir}/%{ruby_release}/json
|
|
|
%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}
|
|
|
%{gem_dir}/%{ruby_release}/gems/json-%{json_version}
|
|
|
%{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
|
|
|
+%endif
|
|
|
|
|
|
%files -n rubygem-minitest
|
|
|
#%{ruby_libdir}/%{ruby_release}/minitest
|
|
@@ -1088,6 +1117,11 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.6-2
|
|
|
+- updated to 2.6.6.
|
|
|
+- disabled json (provided by another srpm temporalily for CVE-2020-10663).
|
|
|
+- updated Patch4.
|
|
|
+
|
|
|
* Mon Mar 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.5-1
|
|
|
- updated to 2.6.5.
|
|
|
- dropped Patch10-11 and 100-102.
|