[packages/ruby: 16/16] Up to 4.0.1 (DEVEL-3.4 branch updated to 4.x)
arekm
arekm at pld-linux.org
Mon Mar 16 09:14:22 CET 2026
commit 429859eec618524407f62d38da8756b3bfad5114
Merge: f7076ee 6f5d181
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Mar 16 07:07:46 2026 +0100
Up to 4.0.1 (DEVEL-3.4 branch updated to 4.x)
archlibdir.patch | 11 +-
autoconf2.70.patch | 62 ---
bison3.59.patch | 21 -
custom-rubygems-location.patch | 41 +-
duplicated-paths.patch | 21 +-
extract-gem-versions.sh | 92 ++++
fix-bison-invocation.patch | 10 -
mkmf-verbose.patch | 25 -
openssl3.patch | 12 -
operating_system.rb | 6 +
ruby-version.patch | 192 +++----
ruby.spec | 967 ++++++++++++++-------------------
rubygems-2.0.0-binary-extensions.patch | 344 ------------
13 files changed, 612 insertions(+), 1192 deletions(-)
---
diff --cc ruby.spec
index a318107,413bbc3..629345b
--- a/ruby.spec
+++ b/ruby.spec
@@@ -12,12 -9,13 +9,13 @@@
%bcond_with bootstrap # build bootstrap version
%bcond_with tests # build without tests
- %define rel 4
- %define ruby_version 2.6
- %define patchlevel 10
-%define rel 1
-%define ruby_version 3.4
-%define patchlevel 9
++%define rel 0.1
++%define ruby_version 4.0
++%define patchlevel 1
%define pkg_version %{ruby_version}.%{patchlevel}
- %define ruby_suffix %{!?with_default_ruby:%{ruby_version}}
- %define doc_version 2_6_9
+ %define ruby_suffix %{!?with_default_ruby:%{ruby_version}}
+ %define doc_version 3_3_0
-%define unicode_version 15.0.0
++%define unicode_version 17.0.0
%define oname ruby
Summary: Ruby - interpreted scripting language
Summary(ja.UTF-8): オブジェクト指向言語Rubyインタプリタ
@@@ -36,21 -34,21 +34,21 @@@ License: (Ruby or BSD) and Public Domai
Group: Development/Languages
# https://www.ruby-lang.org/en/downloads/
Source0: https://cache.ruby-lang.org/pub/ruby/%{ruby_version}/%{oname}-%{pkg_version}.tar.xz
- # Source0-md5: de4cf1c977d6dd05b9842015a9a21efd
- Source2: https://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
- # Source2-md5: f726a5bd96f90969fb15b1e785375af5
- Source3: https://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
- # Source3-md5: 53251c65f70f6e4e37ca0451b6268cac
- Source50: https://www.unicode.org/Public/9.0.0/ucd/CaseFolding.txt
-# Source0-md5: b58158f56343125bc9a56841f4c2cb35
++# Source0-md5: 693837ccd6cbbca625742e642989796a
+ Source2: https://ruby-doc.org/downloads/%{oname}_%{doc_version}_complete_rdocs.tgz
+ # Source2-md5: 058ec53cf5e9d8805161f1b198616b6d
+ %if 0
+ Source50: https://www.unicode.org/Public/%{unicode_version}/ucd/CaseFolding.txt
# Source50-md5: e3fbf2f626f10070000fe66f3a2ff5ef
- Source51: https://www.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt
+ Source51: https://www.unicode.org/Public/%{unicode_version}/ucd/CompositionExclusions.txt
# Source51-md5: 263381d7b4b5e2d52a91e1bbbd4722d4
- Source52: https://www.unicode.org/Public/9.0.0/ucd/NormalizationTest.txt
+ Source52: https://www.unicode.org/Public/%{unicode_version}/ucd/NormalizationTest.txt
# Source52-md5: aacb8a8acfc449d09136fe39f3f97cf1
- Source53: https://www.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt
+ Source53: https://www.unicode.org/Public/%{unicode_version}/ucd/SpecialCasing.txt
# Source53-md5: fea30f45a2f81ffa474fd984d297e2ea
- Source54: https://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
+ Source54: https://www.unicode.org/Public/%{unicode_version}/ucd/UnicodeData.txt
# Source54-md5: dde25b1cf9bbb4ba1140ac12e4128b0b
+ %endif
Source4: rdoc.1
Source5: testrb.1
Source6: operating_system.rb
@@@ -107,55 -98,62 +98,62 @@@ BuildRoot: %{tmpdir}/%{name}-%{version}
# hack: skip rubygem(ipaddr)
%define _noautoreq ipaddr
- # separate modules
- %define bigdecimal_ver 1.4.1
- %define bundler_ver 1.17.2
- %define did_you_mean_ver 1.3.0
- %define io_console_ver 0.4.7
- %define irb_ver 1.0.0
- %define json_ver 2.1.0
- %define minitest_ver 5.11.3
- %define net_telnet_ver 0.2.0
- %define power_assert_ver 1.1.3
- %define psych_ver 3.1.0
- %define rake_ver 12.3.3
- %define rdoc_ver 6.1.2.1
- %define rubygems_ver 3.0.3.1
- %define test_unit_ver 3.2.9
- %define xmlrpc_ver 0.3.0
- # default modules, separated
- %define irb_ver 1.0.0
- # default modules packaged in main modules
- %define cmath_ver 1.0.0
- %define csv_ver 3.0.9
- %define date_ver 2.0.3
- %define dbm_ver 1.0.0
- %define e2mmap_ver 0.1.0
- %define etc_ver 1.0.1
- %define fcntl_ver 1.0.0
- %define fiddle_ver 1.0.0
- %define fileutils_ver 1.1.0
- %define forwardable_ver 1.2.0
- %define gdbm_ver 2.0.0
- %define ipaddr_ver 1.2.2
- %define logger_ver 1.3.0
- %define matrix_ver 0.1.0
- %define mutex_m_ver 0.1.0
- %define ostruct_ver 0.1.0
- %define openssl_ver 2.1.2
- %define prime_ver 0.1.0
- %define rexml_ver 3.1.9.1
- %define rss_ver 0.2.7
- %define scanf_ver 1.0.0
- %define sdbm_ver 1.0.0
- %define shell_ver 0.7
- %define stringio_ver 0.0.2
- %define strscan_ver 1.0.0
- %define sync_ver 0.5.0
- %define thwait_ver 0.1.0
- %define tracer_ver 0.1.0
- %define webrick_ver 1.4.4
- %define zlib_ver 1.0.0
-%define rubygems_ver 3.6.9
++%define rubygems_ver 4.0.3
+ %define rubygems_molinillo_ver 0.8.0
+ %define rubygems_optparse_ver 0.6.0
+ %define rubygems_tsort_ver 0.2.0
+
+ # Default gems.
-%define bundler_ver 2.6.9
-%define bundler_connection_pool_ver 2.5.0
-%define bundler_fileutils_ver 1.7.3
++%define bundler_ver 4.0.3
++%define bundler_connection_pool_ver 2.5.4
++%define bundler_fileutils_ver 1.8.0
+ %define bundler_pub_grub_ver 0.5.0
-%define bundler_net_http_persistent_ver 4.0.4
-%define bundler_thor_ver 1.3.2
++%define bundler_net_http_persistent_ver 4.0.6
++%define bundler_thor_ver 1.4.0
+ %define bundler_tsort_ver 0.2.0
-%define bundler_uri_ver 1.0.4
++%define bundler_uri_ver 1.1.1
+
+ %define did_you_mean_ver 2.0.0
-%define erb_ver 4.0.4
-%define io_console_ver 0.8.1
-%define irb_ver 1.14.3
-%define json_ver 2.9.1
-%define openssl_ver 3.3.1
-%define psych_ver 5.2.2
-%define rdoc_ver 6.14.0
-%define stringio_ver 3.1.2
++%define erb_ver 6.0.1
++%define io_console_ver 0.8.2
++%define irb_ver 1.16.0
++%define json_ver 2.18.0
++%define openssl_ver 4.0.0
++%define psych_ver 5.3.1
++%define rdoc_ver 7.0.3
++%define stringio_ver 3.2.0
+
+ # Bundled gems.
-%define bigdecimal_ver 3.1.8
-%define minitest_ver 5.25.4
-%define power_assert_ver 2.0.5
-%define rake_ver 13.2.1
-%define test_unit_ver 3.6.7
++%define bigdecimal_ver 4.0.1
++%define minitest_ver 6.0.0
++%define power_assert_ver 3.0.1
++%define rake_ver 13.3.1
++%define test_unit_ver 3.7.5
+ %define rexml_ver 3.4.4
-%define rss_ver 0.3.1
-%define net_ftp_ver 0.3.8
-%define net_imap_ver 0.5.8
++%define rss_ver 0.3.2
++%define net_ftp_ver 0.3.9
++%define net_imap_ver 0.6.2
+ %define net_pop_ver 0.1.2
+ %define net_smtp_ver 0.5.1
-%define matrix_ver 0.4.2
-%define prime_ver 0.1.3
-%define rbs_ver 3.8.0
-%define typeprof_ver 0.30.1
-%define debug_ver 1.11.0
++%define matrix_ver 0.4.3
++%define prime_ver 0.1.4
++%define rbs_ver 3.10.0
++%define typeprof_ver 0.31.1
++%define debug_ver 1.11.1
+ %define racc_ver 1.8.1
+ %define nkf_ver 0.2.0
-%define syslog_ver 0.2.0
-%define csv_ver 3.3.2
++%define syslog_ver 0.3.0
++%define csv_ver 3.3.5
+ %define abbrev_ver 0.1.2
-%define base64_ver 0.2.0
-%define drb_ver 2.2.1
++%define base64_ver 0.3.0
++%define drb_ver 2.2.3
+ %define mutex_m_ver 0.3.0
+ %define getoptlong_ver 0.2.1
+ %define observer_ver 0.1.2
+ %define resolv_replace_ver 0.1.1
+ %define rinda_ver 0.2.0
-%define repl_type_completor_ver 0.1.9
++%define repl_type_completor_ver 0.1.12
+
%define ruby_ridir %{_datadir}/ri/system
%define gem_dir %{_datadir}/gems
@@@ -724,7 -734,7 +734,7 @@@ if [ $rubygems_ver != %{rubygems_ver} ]
echo "Set %%define rubygems_ver to $rubygems_ver and re-run."
exit 1
fi
--rdoc_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rdoc/version.rb | xargs)
++rdoc_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' .bundle/gems/rdoc-*/lib/rdoc/version.rb | xargs)
if [ "$rdoc_ver" != %{rdoc_ver} ]; then
echo "Set %%define rdoc_ver to $rdoc_ver and re-run."
exit 1
@@@ -824,7 -843,8 +843,7 @@@ sed -i -e 's/Version: \${ruby_version}/
# Kill bundled certificates, as they should be part of ca-certificates.
for cert in \
-- GlobalSignRootCA.pem \
- GlobalSignRootCA_R3.pem \
++ GlobalSign.pem \
; do
%{__rm} $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/ssl_certs/*/$cert
done
@@@ -858,22 -878,11 +877,7 @@@ ln -s %{gem_dir}/gems/rake-%{rake_ver}/
%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/rake-%{rake_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
%endif
--install -d $RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
--%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/rdoc* $RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
--ln -s %{gem_dir}/gems/rdoc-%{rdoc_ver}/lib/rdoc $RPM_BUILD_ROOT%{ruby_libdir}
--ln -s %{gem_dir}/gems/rdoc-%{rdoc_ver}/lib/rdoc.rb $RPM_BUILD_ROOT%{ruby_libdir}
--%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/rdoc-%{rdoc_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
-
- install -d $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
- install -d $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal
- %{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
- %{__mv} $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
- %{__mv} $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal/util.so $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/
- %{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
- ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal
- ln -s %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so
- install -d $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal
- ln -s %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/util.so $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal/util.so
++# rdoc is a bundled gem in 4.0, already properly placed by make install
install -d $RPM_BUILD_ROOT%{gem_dir}/gems/io-console-%{io_console_ver}/lib
install -d $RPM_BUILD_ROOT%{gem_libdir}/io-console-%{io_console_ver}/lib/io
@@@ -952,22 -968,45 +963,45 @@@ don
%{__sed} -i -e '1s,/usr/bin/env ruby,/usr/bin/ruby,' \
$RPM_BUILD_ROOT%{_bindir}/irb \
- $RPM_BUILD_ROOT%{ruby_libdir}/abbrev.rb \
$RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/exe/rake \
$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/exe/{rdoc,ri} \
- $RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/exe/{bundle,bundler} \
- $RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/libexec/{bundle,bundler} \
++ $RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/exe/{bundle,bundler} \
+ $RPM_BUILD_ROOT%{gem_dir}/gems/debug-%{debug_ver}/exe/rdbg \
+ $RPM_BUILD_ROOT%{gem_dir}/gems/rbs-%{rbs_ver}/exe/rbs \
+ $RPM_BUILD_ROOT%{gem_dir}/gems/erb-%{erb_ver}/libexec/erb \
+ $RPM_BUILD_ROOT%{gem_dir}/gems/typeprof-%{typeprof_ver}/bin/typeprof \
+ $RPM_BUILD_ROOT%{gem_dir}/gems/syntax_suggest-*/exe/syntax_suggest \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{cal,test,time,uumerge}.rb \
- $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb \
- $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
- $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper}/*.rb
++ $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{logger,openssl,ripper}/*.rb
# gem non library files
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/{[A-Z]*,benchmark,doc,test,tmp,did_you_mean.gemspec,.*}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/{[A-Z]*,test,.autotest}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/{[A-Z]*,bin,net-telnet.gemspec,.*}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/{[A-Z]*,bin,power_assert.gemspec,.*}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,bin,doc,rake.gemspec,azure-pipelines.yml}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,doc,sample,test}
- %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/xmlrpc-%{xmlrpc_ver}/{[A-Z]*,bin,xmlrpc.gemspec,.*}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/matrix-%{matrix_ver}/[A-Z]*
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/{[A-Z]*,test}
++%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/{[A-Z]*,bin,test}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-ftp-%{net_ftp_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-pop-%{net_pop_ver}/[A-Z]*
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-imap-%{net_imap_ver}/{[A-Z]*,docs,benchmarks}
++%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-imap-%{net_imap_ver}/{[A-Z]*,docs}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-smtp-%{net_smtp_ver}/[A-Z]*
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/prime-%{prime_ver}/{[A-Z]*,bin}
++%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/prime-%{prime_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/debug-%{debug_ver}/{[A-Z]*,misc,ext}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,doc}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,doc,sample}
++%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,bin,doc,sample}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/racc-%{racc_ver}/{bin,doc,ext} $RPM_BUILD_ROOT%{_bindir}/racc # racc binary can be installed from ruby-racc package
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rexml-%{rexml_ver}/{[A-Z]*,doc}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rss-%{rss_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/{[A-Z]*,ext}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/nkf-%{nkf_ver}/{[A-Z]*,ext,bin}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/syslog-%{syslog_ver}/{[A-Z]*,ext}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rbs-%{rbs_ver}/{[A-Z]*,docs,ext,sig,src,core,stdlib,config.yml,goodcheck.yml,*.gemspec}
++%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rbs-%{rbs_ver}/{[A-Z]*,docs,ext,sig,src,core,stdlib,config.yml,goodcheck.yml}
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/csv-%{csv_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/abbrev-%{abbrev_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/base64-%{base64_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/drb-%{drb_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/mutex_m-%{mutex_m_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/getoptlong-%{getoptlong_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/observer-%{observer_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/resolv-replace-%{resolv_replace_ver}/[A-Z]*
+ %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rinda-%{rinda_ver}/[A-Z]*
%if %{without batteries}
# packaged separately
@@@ -1028,23 -1066,23 +1061,16 @@@ rm -rf $RPM_BUILD_ROO
%files irb
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/irb%{ruby_suffix}
--%{ruby_libdir}/irb.rb
--%{ruby_libdir}/irb
--%{gem_dir}/specifications/default/irb-%{irb_ver}.gemspec
--%{_mandir}/man1/irb%{ruby_suffix}.1*
++%{gem_dir}/gems/irb-%{irb_ver}
++%{gem_dir}/specifications/irb-%{irb_ver}.gemspec
%files rdoc
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/rdoc%{ruby_suffix}
%attr(755,root,root) %{_bindir}/ri%{ruby_suffix}
%{_mandir}/man1/rdoc%{ruby_suffix}.1*
--%{ruby_libdir}/rdoc
--%dir %{gem_dir}/gems/rdoc-%{rdoc_ver}
--%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
++%{gem_dir}/gems/rdoc-%{rdoc_ver}
%{gem_dir}/specifications/rdoc-%{rdoc_ver}.gemspec
--%dir %{gem_dir}/gems/rdoc-%{rdoc_ver}/exe
--%{gem_dir}/gems/rdoc-%{rdoc_ver}/exe/rdoc
--%{gem_dir}/gems/rdoc-%{rdoc_ver}/exe/ri
%if %{with batteries}
%files rubygems
@@@ -1124,12 -1166,9 +1154,8 @@@
%defattr(644,root,root,755)
%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}
%dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}
- %dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
- %attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so
- %dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal
- %attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/util.so
- %{ruby_libdir}/bigdecimal.rb
- %{ruby_libdir}/bigdecimal
+ %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/gem.build_complete
-%dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
-%attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so
++%attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/bigdecimal.so
%{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec
%files io-console
@@@ -1152,93 -1193,205 +1180,180 @@@
%attr(755,root,root) %{gem_libdir}/psych-%{psych_ver}/lib/psych.so
%{gem_dir}/specifications/psych-%{psych_ver}.gemspec
- %files xmlrpc
+ %files rexml
%defattr(644,root,root,755)
- %{gem_dir}/gems/xmlrpc-%{xmlrpc_ver}
- %{gem_dir}/specifications/xmlrpc-%{xmlrpc_ver}.gemspec
+ %dir %{gem_dir}/gems/rexml-%{rexml_ver}
+ %{gem_dir}/gems/rexml-%{rexml_ver}/lib
+ %{gem_dir}/specifications/rexml-%{rexml_ver}.gemspec
+
+ %files rss
+ %defattr(644,root,root,755)
+ %dir %{gem_dir}/gems/rss-%{rss_ver}
+ %{gem_dir}/gems/rss-%{rss_ver}/lib
+ %{gem_dir}/specifications/rss-%{rss_ver}.gemspec
+
+ %files bundled-gems
+ %defattr(644,root,root,755)
+ %attr(755,root,root) %{_bindir}/rdbg
+ %dir %{gem_libdir}/debug-%{debug_ver}
+ %{gem_libdir}/debug-%{debug_ver}/gem.build_complete
+ %dir %{gem_libdir}/debug-%{debug_ver}/debug
+ %attr(755,root,root) %{gem_libdir}/debug-%{debug_ver}/debug/debug.so
+ %dir %{gem_dir}/gems/debug-%{debug_ver}
+ %{gem_dir}/gems/debug-%{debug_ver}/exe
+ %{gem_dir}/gems/debug-%{debug_ver}/lib
+ %{gem_dir}/specifications/debug-%{debug_ver}.gemspec
+
+ %dir %{gem_dir}/gems/net-ftp-%{net_ftp_ver}
+ %{gem_dir}/gems/net-ftp-%{net_ftp_ver}/lib
+ %{gem_dir}/specifications/net-ftp-%{net_ftp_ver}.gemspec
+
+ %dir %{gem_dir}/gems/net-imap-%{net_imap_ver}
+ %{gem_dir}/gems/net-imap-%{net_imap_ver}/lib
+ %dir %{gem_dir}/gems/net-imap-%{net_imap_ver}/rakelib
+ %{gem_dir}/gems/net-imap-%{net_imap_ver}/rakelib/*.*
+ %{gem_dir}/specifications/net-imap-%{net_imap_ver}.gemspec
+
+ %dir %{gem_dir}/gems/net-pop-%{net_pop_ver}
+ %{gem_dir}/gems/net-pop-%{net_pop_ver}/lib
+ %{gem_dir}/specifications/net-pop-%{net_pop_ver}.gemspec
+
+ %dir %{gem_dir}/gems/net-smtp-%{net_smtp_ver}
+ %{gem_dir}/gems/net-smtp-%{net_smtp_ver}/lib
+ %{gem_dir}/specifications/net-smtp-%{net_smtp_ver}.gemspec
+
+ %dir %{gem_dir}/gems/matrix-%{matrix_ver}
+ %{gem_dir}/gems/matrix-%{matrix_ver}/lib
+ %{gem_dir}/specifications/matrix-%{matrix_ver}.gemspec
+
+ %dir %{gem_dir}/gems/prime-%{prime_ver}
+ %{gem_dir}/gems/prime-%{prime_ver}/lib
+ %{gem_dir}/specifications/prime-%{prime_ver}.gemspec
+
+ # Gems moved from default to bundled in 3.4
+ %dir %{gem_dir}/gems/abbrev-%{abbrev_ver}
+ %{gem_dir}/gems/abbrev-%{abbrev_ver}/lib
+ %{gem_dir}/specifications/abbrev-%{abbrev_ver}.gemspec
+
+ %dir %{gem_dir}/gems/base64-%{base64_ver}
+ %{gem_dir}/gems/base64-%{base64_ver}/lib
+ %{gem_dir}/specifications/base64-%{base64_ver}.gemspec
+
+ %dir %{gem_dir}/gems/csv-%{csv_ver}
+ %{gem_dir}/gems/csv-%{csv_ver}/lib
+ %{gem_dir}/specifications/csv-%{csv_ver}.gemspec
+
+ %dir %{gem_dir}/gems/drb-%{drb_ver}
+ %{gem_dir}/gems/drb-%{drb_ver}/lib
+ %{gem_dir}/specifications/drb-%{drb_ver}.gemspec
+
+ %dir %{gem_dir}/gems/getoptlong-%{getoptlong_ver}
+ %{gem_dir}/gems/getoptlong-%{getoptlong_ver}/lib
+ %{gem_dir}/specifications/getoptlong-%{getoptlong_ver}.gemspec
+
+ %dir %{gem_dir}/gems/mutex_m-%{mutex_m_ver}
+ %{gem_dir}/gems/mutex_m-%{mutex_m_ver}/lib
+ %{gem_dir}/specifications/mutex_m-%{mutex_m_ver}.gemspec
+
+ %dir %{gem_dir}/gems/nkf-%{nkf_ver}
+ %{gem_dir}/gems/nkf-%{nkf_ver}/lib
+ %dir %{gem_libdir}/nkf-%{nkf_ver}
+ %{gem_libdir}/nkf-%{nkf_ver}/gem.build_complete
+ %attr(755,root,root) %{gem_libdir}/nkf-%{nkf_ver}/nkf.so
+ %{gem_dir}/specifications/nkf-%{nkf_ver}.gemspec
+
+ %dir %{gem_dir}/gems/observer-%{observer_ver}
+ %{gem_dir}/gems/observer-%{observer_ver}/lib
+ %{gem_dir}/specifications/observer-%{observer_ver}.gemspec
+
+ %dir %{gem_dir}/gems/racc-%{racc_ver}
+ %{gem_dir}/gems/racc-%{racc_ver}/lib
+ %dir %{gem_libdir}/racc-%{racc_ver}
+ %{gem_libdir}/racc-%{racc_ver}/gem.build_complete
-%attr(755,root,root) %{gem_libdir}/racc-%{racc_ver}/cparse.so
++%dir %{gem_libdir}/racc-%{racc_ver}/racc
++%attr(755,root,root) %{gem_libdir}/racc-%{racc_ver}/racc/cparse.so
+ %{gem_dir}/specifications/racc-%{racc_ver}.gemspec
+
+ %dir %{gem_dir}/gems/resolv-replace-%{resolv_replace_ver}
+ %{gem_dir}/gems/resolv-replace-%{resolv_replace_ver}/lib
+ %{gem_dir}/specifications/resolv-replace-%{resolv_replace_ver}.gemspec
+
+ %dir %{gem_dir}/gems/rinda-%{rinda_ver}
+ %{gem_dir}/gems/rinda-%{rinda_ver}/lib
+ %{gem_dir}/specifications/rinda-%{rinda_ver}.gemspec
+
+ %dir %{gem_dir}/gems/syslog-%{syslog_ver}
+ %{gem_dir}/gems/syslog-%{syslog_ver}/lib
+ %dir %{gem_libdir}/syslog-%{syslog_ver}
+ %{gem_libdir}/syslog-%{syslog_ver}/gem.build_complete
-%attr(755,root,root) %{gem_libdir}/syslog-%{syslog_ver}/syslog.so
++%attr(755,root,root) %{gem_libdir}/syslog-%{syslog_ver}/syslog_ext.so
+ %{gem_dir}/specifications/syslog-%{syslog_ver}.gemspec
+
+ %dir %{gem_dir}/gems/repl_type_completor-%{repl_type_completor_ver}
+ %{gem_dir}/gems/repl_type_completor-%{repl_type_completor_ver}/lib
+ %{gem_dir}/specifications/repl_type_completor-%{repl_type_completor_ver}.gemspec
+
%files modules
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
+ %attr(755,root,root) %{_bindir}/syntax_suggest%{ruby_suffix}
%{ruby_libdir}/cgi
%{ruby_libdir}/digest
- %{ruby_libdir}/drb
--%{ruby_libdir}/fiddle
%{ruby_libdir}/io
- %{ruby_libdir}/matrix
%{ruby_libdir}/net
%{ruby_libdir}/openssl
%{ruby_libdir}/optparse
- %{ruby_libdir}/racc
- %{ruby_libdir}/rexml
- %{ruby_libdir}/rinda
+ %{ruby_libdir}/prism
%{ruby_libdir}/ripper
- %{ruby_libdir}/rss
- %{ruby_libdir}/shell
- %{ruby_libdir}/syslog
%{ruby_libdir}/test
%{ruby_libdir}/uri
- %{ruby_libdir}/webrick
%{ruby_libdir}/yaml
-
%{ruby_libdir}/English.rb
- %{ruby_libdir}/abbrev.rb
- %{ruby_libdir}/base64.rb
--%{ruby_libdir}/benchmark.rb
-%dir %{ruby_libdir}/benchmark
-%{ruby_libdir}/benchmark/version.rb
+ %{ruby_libdir}/bundled_gems.rb
%{ruby_libdir}/bundler
%{ruby_libdir}/bundler.rb
%{ruby_libdir}/cgi.rb
- %{ruby_libdir}/cmath.rb
- %{ruby_libdir}/csv.rb
- %{ruby_libdir}/csv
%{ruby_libdir}/coverage.rb
%{ruby_libdir}/date.rb
- %{ruby_libdir}/debug.rb
%{ruby_libdir}/delegate.rb
+ %{ruby_libdir}/did_you_mean.rb
+ %{ruby_libdir}/did_you_mean
%{ruby_libdir}/digest.rb
- %{ruby_libdir}/drb.rb
- %{ruby_libdir}/e2mmap.rb
- %{ruby_libdir}/e2mmap
+ %{ruby_libdir}/error_highlight.rb
+ %dir %{ruby_libdir}/error_highlight
+ %{ruby_libdir}/error_highlight/*.rb
%{ruby_libdir}/erb.rb
+ %dir %{ruby_libdir}/erb
+ %{ruby_libdir}/erb/*.rb
%{ruby_libdir}/expect.rb
--%{ruby_libdir}/fiddle.rb
%{ruby_libdir}/fileutils.rb
- %{ruby_libdir}/fileutils
%{ruby_libdir}/find.rb
%{ruby_libdir}/forwardable.rb
%dir %{ruby_libdir}/forwardable
%{ruby_libdir}/forwardable/impl.rb
- %{ruby_libdir}/getoptlong.rb
%{ruby_libdir}/ipaddr.rb
%{ruby_libdir}/json.rb
- %{ruby_libdir}/kconv.rb
--%{ruby_libdir}/logger.rb
- %{ruby_libdir}/matrix.rb
-%dir %{ruby_libdir}/logger
-%{ruby_libdir}/logger/*.rb
%{ruby_libdir}/monitor.rb
- %{ruby_libdir}/mutex_m.rb
- %{ruby_libdir}/observer.rb
+ %{ruby_libdir}/objspace.rb
+ %dir %{ruby_libdir}/objspace
+ %{ruby_libdir}/objspace/*.rb
%{ruby_libdir}/open-uri.rb
%{ruby_libdir}/open3.rb
+ %dir %{ruby_libdir}/open3
+ %{ruby_libdir}/open3/version.rb
%{ruby_libdir}/openssl.rb
%{ruby_libdir}/optionparser.rb
%{ruby_libdir}/optparse.rb
--%{ruby_libdir}/ostruct.rb
%{ruby_libdir}/pathname.rb
%{ruby_libdir}/pp.rb
%{ruby_libdir}/prettyprint.rb
- %{ruby_libdir}/prime.rb
- %{ruby_libdir}/profile.rb
- %{ruby_libdir}/profiler.rb
- %{ruby_libdir}/pstore.rb
- %{ruby_libdir}/rdoc.rb
- %{ruby_libdir}/resolv-replace.rb
+ %{ruby_libdir}/prism.rb
-%{ruby_libdir}/pstore.rb
+ %dir %{ruby_libdir}/random
+ %{ruby_libdir}/random/*.rb
-%{ruby_libdir}/rdoc.rb
-%{ruby_libdir}/readline.rb
-%{ruby_libdir}/reline.rb
-%dir %{ruby_libdir}/reline
-%{ruby_libdir}/reline/*.rb
-%dir %{ruby_libdir}/reline/key_actor
-%{ruby_libdir}/reline/key_actor/*.rb
-%dir %{ruby_libdir}/reline/io
-%{ruby_libdir}/reline/io/*.rb
-%dir %{ruby_libdir}/reline/unicode
-%{ruby_libdir}/reline/unicode/*.rb
%{ruby_libdir}/resolv.rb
%{ruby_libdir}/ripper.rb
- %{ruby_libdir}/rss.rb
- %{ruby_libdir}/scanf.rb
-%dir %{ruby_libdir}/ruby_vm
-%{ruby_libdir}/ruby_vm/rjit
%{ruby_libdir}/securerandom.rb
--%{ruby_libdir}/set.rb
- %{ruby_libdir}/shell.rb
-%dir %{ruby_libdir}/set
-%{ruby_libdir}/set/*.rb
%{ruby_libdir}/shellwords.rb
%{ruby_libdir}/singleton.rb
%{ruby_libdir}/socket.rb
@@@ -1262,31 -1414,24 +1376,21 @@@
%if %{with batteries}
%exclude %{ruby_libdir}/rubygems.rb
%endif
--%exclude %{ruby_libdir}/irb.rb
%exclude %{ruby_libdir}/mkmf.rb
%{ruby_archdir}/rbconfig.rb
%attr(755,root,root) %{ruby_archdir}/continuation.so
%attr(755,root,root) %{ruby_archdir}/coverage.so
%attr(755,root,root) %{ruby_archdir}/date_core.so
- %attr(755,root,root) %{ruby_archdir}/dbm.so
%attr(755,root,root) %{ruby_archdir}/digest.so
%attr(755,root,root) %{ruby_archdir}/etc.so
+ %attr(755,root,root) %{ruby_archdir}/erb/escape.so
%attr(755,root,root) %{ruby_archdir}/fcntl.so
- %attr(755,root,root) %{ruby_archdir}/fiber.so
--%attr(755,root,root) %{ruby_archdir}/fiddle.so
- %attr(755,root,root) %{ruby_archdir}/gdbm.so
- %attr(755,root,root) %{ruby_archdir}/nkf.so
+ %attr(755,root,root) %{ruby_archdir}/monitor.so
%attr(755,root,root) %{ruby_archdir}/objspace.so
%attr(755,root,root) %{ruby_archdir}/openssl.so
--%attr(755,root,root) %{ruby_archdir}/pathname.so
%attr(755,root,root) %{ruby_archdir}/pty.so
- %attr(755,root,root) %{ruby_archdir}/readline.so
%attr(755,root,root) %{ruby_archdir}/ripper.so
- %attr(755,root,root) %{ruby_archdir}/sdbm.so
%attr(755,root,root) %{ruby_archdir}/socket.so
%attr(755,root,root) %{ruby_archdir}/stringio.so
%attr(755,root,root) %{ruby_archdir}/strscan.so
@@@ -1313,41 -1455,15 +1414,14 @@@
%dir %{gem_dir}
%dir %{gem_dir}/gems
+ # for libexec/erb
+ %{gem_dir}/gems/erb-%{erb_ver}
+
%dir %{gem_dir}/specifications
%dir %{gem_dir}/specifications/default
- %{gem_dir}/specifications/default/cmath-%{cmath_ver}.gemspec
- %{gem_dir}/specifications/default/csv-%{csv_ver}.gemspec
- %{gem_dir}/specifications/default/date-%{date_ver}.gemspec
- %{gem_dir}/specifications/default/dbm-%{dbm_ver}.gemspec
- %{gem_dir}/specifications/default/e2mmap-%{e2mmap_ver}.gemspec
- %{gem_dir}/specifications/default/etc-%{etc_ver}.gemspec
- %{gem_dir}/specifications/default/fcntl-%{fcntl_ver}.gemspec
- %{gem_dir}/specifications/default/fiddle-%{fiddle_ver}.gemspec
- %{gem_dir}/specifications/default/fileutils-%{fileutils_ver}.gemspec
- %{gem_dir}/specifications/default/forwardable-%{forwardable_ver}.gemspec
- %{gem_dir}/specifications/default/gdbm-%{gdbm_ver}.gemspec
- %{gem_dir}/specifications/default/ipaddr-%{ipaddr_ver}.gemspec
- %{gem_dir}/specifications/default/logger-%{logger_ver}.gemspec
- %{gem_dir}/specifications/default/matrix-%{matrix_ver}.gemspec
- %{gem_dir}/specifications/default/mutex_m-%{mutex_m_ver}.gemspec
- %{gem_dir}/specifications/default/ostruct-%{ostruct_ver}.gemspec
- %{gem_dir}/specifications/default/openssl-%{openssl_ver}.gemspec
- %{gem_dir}/specifications/default/prime-%{prime_ver}.gemspec
- %{gem_dir}/specifications/default/rexml-%{rexml_ver}.gemspec
- %{gem_dir}/specifications/default/rss-%{rss_ver}.gemspec
- %{gem_dir}/specifications/default/scanf-%{scanf_ver}.gemspec
- %{gem_dir}/specifications/default/sdbm-%{sdbm_ver}.gemspec
- %{gem_dir}/specifications/default/shell-%{shell_ver}.gemspec
- %{gem_dir}/specifications/default/stringio-%{stringio_ver}.gemspec
- %{gem_dir}/specifications/default/strscan-%{strscan_ver}.gemspec
- %{gem_dir}/specifications/default/sync-%{sync_ver}.gemspec
- %{gem_dir}/specifications/default/thwait-%{thwait_ver}.gemspec
- %{gem_dir}/specifications/default/tracer-%{tracer_ver}.gemspec
- %{gem_dir}/specifications/default/webrick-%{webrick_ver}.gemspec
- %{gem_dir}/specifications/default/zlib-%{zlib_ver}.gemspec
+ %{gem_dir}/specifications/default/*.gemspec
%{_mandir}/man1/erb%{ruby_suffix}.1*
--%{_mandir}/man1/ri%{ruby_suffix}.1*
%if %{with doc}
%files doc
@@@ -1357,250 -1472,20 +1430,18 @@@
%files doc-ri
%defattr(644,root,root,755)
- %{ruby_ridir}/ACL
- %{ruby_ridir}/ARGF
- %{ruby_ridir}/Abbrev
- %{ruby_ridir}/Addrinfo
- %{ruby_ridir}/ArgumentError
- %{ruby_ridir}/Array
- %{ruby_ridir}/Base64
- %{ruby_ridir}/BasicObject
- %{ruby_ridir}/BasicSocket
- %{ruby_ridir}/Benchmark
- %{ruby_ridir}/BigDecimal
- %{ruby_ridir}/BigMath
- %{ruby_ridir}/Binding
- %{ruby_ridir}/Bundler
- %{ruby_ridir}/CGI
- %{ruby_ridir}/CMath
- %{ruby_ridir}/CSV
- %{ruby_ridir}/Class
- %{ruby_ridir}/ClosedQueueError
- %{ruby_ridir}/Comparable
- %{ruby_ridir}/Complex
- %{ruby_ridir}/ConditionVariable
- %{ruby_ridir}/Continuation
- %{ruby_ridir}/Coverage
- %{ruby_ridir}/DBM
- %{ruby_ridir}/DBMError
- %{ruby_ridir}/DEBUGGER__
- %{ruby_ridir}/DRb
- %{ruby_ridir}/Data
- %{ruby_ridir}/Date
- %{ruby_ridir}/DateTime
- %{ruby_ridir}/Delegator
- %{ruby_ridir}/Digest
- %{ruby_ridir}/Dir
- %{ruby_ridir}/ENV
- %{ruby_ridir}/EOFError
- %{ruby_ridir}/ERB
- %{ruby_ridir}/EXCEPTION_TYPE
- %{ruby_ridir}/Encoding
- %{ruby_ridir}/EncodingError
- %{ruby_ridir}/English
- %{ruby_ridir}/Enumerable
- %{ruby_ridir}/Enumerator
- %{ruby_ridir}/Errno
- %{ruby_ridir}/Etc
- %{ruby_ridir}/Exception
- %{ruby_ridir}/Exception2MessageMapper
- %{ruby_ridir}/FalseClass
- %{ruby_ridir}/Fcntl
- %{ruby_ridir}/Fiber
- %{ruby_ridir}/FiberError
- %{ruby_ridir}/Fiddle
- %{ruby_ridir}/File
- %{ruby_ridir}/FileTest
- %{ruby_ridir}/FileUtils
- %{ruby_ridir}/Find
- %{ruby_ridir}/Float
- %{ruby_ridir}/FloatDomainError
- %{ruby_ridir}/Forwardable
- %{ruby_ridir}/FrozenError
- %{ruby_ridir}/GC
- %{ruby_ridir}/GDBM
- %{ruby_ridir}/GDBMError
- %{ruby_ridir}/GDBMFatalError
- %{ruby_ridir}/Gem
- %{ruby_ridir}/GetoptLong
- %{ruby_ridir}/HTTPClientException
- %{ruby_ridir}/HTTPGatewayTimeOut
- %{ruby_ridir}/HTTPMovedTemporarily
- %{ruby_ridir}/HTTPMultipleChoice
- %{ruby_ridir}/HTTPRequestEntityTooLarge
- %{ruby_ridir}/HTTPRequestTimeOut
- %{ruby_ridir}/HTTPRequestURITooLarge
- %{ruby_ridir}/HTTPRequestURITooLong
- %{ruby_ridir}/HTTPRequestedRangeNotSatisfiable
- %{ruby_ridir}/Hash
- %{ruby_ridir}/IO
- %{ruby_ridir}/IOError
- %{ruby_ridir}/IPAddr
- %{ruby_ridir}/IPSocket
- %{ruby_ridir}/IRB
- %{ruby_ridir}/IndexError
- %{ruby_ridir}/Integer
- %{ruby_ridir}/Interrupt
- %{ruby_ridir}/JSON
- %{ruby_ridir}/Jacobian
- %{ruby_ridir}/Kconv
- %{ruby_ridir}/Kernel
- %{ruby_ridir}/KeyError
- %{ruby_ridir}/LUSolve
- %{ruby_ridir}/LoadError
- %{ruby_ridir}/LocalJumpError
- %{ruby_ridir}/Logger
- %{ruby_ridir}/MakeMakefile
- %{ruby_ridir}/Marshal
- %{ruby_ridir}/MatchData
- %{ruby_ridir}/Math
- %{ruby_ridir}/Matrix
- %{ruby_ridir}/Method
- %{ruby_ridir}/Module
- %{ruby_ridir}/Monitor
- %{ruby_ridir}/MonitorMixin
- %{ruby_ridir}/Mutex
- %{ruby_ridir}/Mutex_m
- %{ruby_ridir}/NKF
- %{ruby_ridir}/NameError
- %{ruby_ridir}/Net
- %{ruby_ridir}/Newton
- %{ruby_ridir}/NilClass
- %{ruby_ridir}/NoMemoryError
- %{ruby_ridir}/NoMethodError
- %{ruby_ridir}/NotImplementedError
- %{ruby_ridir}/Numeric
- %{ruby_ridir}/OLEProperty
- %{ruby_ridir}/Object
- %{ruby_ridir}/ObjectSpace
- %{ruby_ridir}/Observable
- %{ruby_ridir}/Open3
- %{ruby_ridir}/OpenSSL
- %{ruby_ridir}/OpenStruct
- %{ruby_ridir}/OpenURI
- %{ruby_ridir}/OptionParser
- %{ruby_ridir}/PP
- %{ruby_ridir}/PStore
- %{ruby_ridir}/PTY
- %{ruby_ridir}/Pathname
- %{ruby_ridir}/PrettyPrint
- %{ruby_ridir}/Prime
- %{ruby_ridir}/Proc
- %{ruby_ridir}/Process
- %{ruby_ridir}/Profiler__
- %{ruby_ridir}/Psych
- %{ruby_ridir}/Queue
- %{ruby_ridir}/RDoc
- %{ruby_ridir}/RDocTask
- %{ruby_ridir}/REXML
- %{ruby_ridir}/RSS
- %{ruby_ridir}/Racc
- %{ruby_ridir}/Rake
- %{ruby_ridir}/Random
- %{ruby_ridir}/Range
- %{ruby_ridir}/RangeError
- %{ruby_ridir}/Rational
- %{ruby_ridir}/RbConfig
- %{ruby_ridir}/Readline
- %{ruby_ridir}/Regexp
- %{ruby_ridir}/RegexpError
- %{ruby_ridir}/Resolv
- %{ruby_ridir}/Rinda
- %{ruby_ridir}/Ripper
- %{ruby_ridir}/RubyLex
- %{ruby_ridir}/RubyToken
- %{ruby_ridir}/RubyVM
- %{ruby_ridir}/RuntimeError
- %{ruby_ridir}/SDBM
- %{ruby_ridir}/SDBMError
- %{ruby_ridir}/SOCKSSocket
- %{ruby_ridir}/Scanf
- %{ruby_ridir}/ScriptError
- %{ruby_ridir}/SecureRandom
- %{ruby_ridir}/SecurityError
- %{ruby_ridir}/Set
- %{ruby_ridir}/Shell
- %{ruby_ridir}/Shellwords
- %{ruby_ridir}/Signal
- %{ruby_ridir}/SignalException
- %{ruby_ridir}/SimpleDelegator
- %{ruby_ridir}/SingleForwardable
- %{ruby_ridir}/Singleton
- %{ruby_ridir}/SizedQueue
- %{ruby_ridir}/Socket
- %{ruby_ridir}/SocketError
- %{ruby_ridir}/SortedSet
- %{ruby_ridir}/StandardError
- %{ruby_ridir}/StopIteration
- %{ruby_ridir}/String
- %{ruby_ridir}/StringIO
- %{ruby_ridir}/StringScanner
- %{ruby_ridir}/Struct
- %{ruby_ridir}/Symbol
- %{ruby_ridir}/Sync
- %{ruby_ridir}/Sync_m
- %{ruby_ridir}/Synchronizer
- %{ruby_ridir}/Synchronizer_m
- %{ruby_ridir}/SyntaxError
- %{ruby_ridir}/Syslog
- %{ruby_ridir}/SystemCallError
- %{ruby_ridir}/SystemExit
- %{ruby_ridir}/SystemStackError
- %{ruby_ridir}/TCPServer
- %{ruby_ridir}/TCPSocket
- %{ruby_ridir}/TSort
- %{ruby_ridir}/TempIO
- %{ruby_ridir}/Tempfile
- %{ruby_ridir}/ThWait
- %{ruby_ridir}/Thread
- %{ruby_ridir}/ThreadError
- %{ruby_ridir}/ThreadGroup
- %{ruby_ridir}/ThreadsWait
- %{ruby_ridir}/Time
- %{ruby_ridir}/Timeout
- %{ruby_ridir}/TracePoint
- %{ruby_ridir}/Tracer
- %{ruby_ridir}/TrueClass
- %{ruby_ridir}/TypeError
- %{ruby_ridir}/UDPSocket
- %{ruby_ridir}/UNIXServer
- %{ruby_ridir}/UNIXSocket
- %{ruby_ridir}/URI
- %{ruby_ridir}/UnboundMethod
- %{ruby_ridir}/UncaughtThrowError
- %{ruby_ridir}/UnicodeNormalize
- %{ruby_ridir}/Vector
- %{ruby_ridir}/WEBrick
- %{ruby_ridir}/WIN32OLE
- %{ruby_ridir}/WIN32OLERuntimeError
- %{ruby_ridir}/WIN32OLEQueryInterfaceError
- %{ruby_ridir}/WIN32OLE_EVENT
- %{ruby_ridir}/WIN32OLE_METHOD
- %{ruby_ridir}/WIN32OLE_PARAM
- %{ruby_ridir}/WIN32OLE_RECORD
- %{ruby_ridir}/WIN32OLE_TYPE
- %{ruby_ridir}/WIN32OLE_TYPELIB
- %{ruby_ridir}/WIN32OLE_VARIABLE
- %{ruby_ridir}/WIN32OLE_VARIANT
- %{ruby_ridir}/Warning
- %{ruby_ridir}/WeakRef
- %{ruby_ridir}/XML
- %{ruby_ridir}/XMLEncoding_ja
- %{ruby_ridir}/XMP
- %{ruby_ridir}/YAML
- %{ruby_ridir}/ZeroDivisionError
- %{ruby_ridir}/Zlib
+ %{ruby_ridir}/[A-Z]*
+ %{ruby_ridir}/contributing
%{ruby_ridir}/fatal
- %{ruby_ridir}/lib
%{ruby_ridir}/syntax
- %{ruby_ridir}/page-CONTRIBUTING_md.ri
- %{ruby_ridir}/page-COPYING.ri
-%{ruby_ridir}/windows
+ %{ruby_ridir}/optparse
%lang(ja) %{ruby_ridir}/page-COPYING_ja.ri
+ %lang(ja) %{ruby_ridir}/page-README_ja_md.ri
+ %{ruby_ridir}/page-COPYING.ri
%{ruby_ridir}/page-LEGAL.ri
- %{ruby_ridir}/page-NEWS*.ri
+ %{ruby_ridir}/page-NEWS_md.ri
%{ruby_ridir}/page-README_md.ri
- %lang(ja) %{ruby_ridir}/page-README_ja_md.ri
- %{ruby_ridir}/page-*_rdoc.ri
+ %{ruby_ridir}/page-[a-z]*.ri
-%{ruby_ridir}/yjit
%endif
%files examples
diff --cc archlibdir.patch
index 116bb66,116bb66..156f7d7
--- a/archlibdir.patch
+++ b/archlibdir.patch
@@@ -1,4 -1,4 +1,4 @@@
--From 07c666ba5c3360dd6f43605a8ac7c85c99c1721f Mon Sep 17 00:00:00 2001
++From e1293f665128b0d9c5bfa0b5beeab4afebf07e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Tue, 1 Oct 2013 12:22:40 +0200
Subject: [PATCH] Allow to configure libruby.so placement.
@@@ -8,12 -8,12 +8,12 @@@
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
--index 11fc237552..b77e88fc37 100644
++index a64358fada..b3bdfad1eb 100644
--- a/configure.ac
+++ b/configure.ac
--@@ -3085,6 +3085,11 @@ AS_IF([test ${multiarch+set}], [
++@@ -3556,6 +3556,11 @@ AS_IF([test ${multiarch+set}], [
])
--
++
archlibdir='${libdir}/${arch}'
+AC_ARG_WITH(archlibdir,
+ AS_HELP_STRING([--with-archlibdir=DIR],
@@@ -23,6 -23,6 +23,3 @@@
sitearchlibdir='${libdir}/${sitearch}'
archincludedir='${includedir}/${arch}'
sitearchincludedir='${includedir}/${sitearch}'
----
--1.8.3.1
--
diff --cc custom-rubygems-location.patch
index 431ce5b,0cb2012..3ac5a50
--- a/custom-rubygems-location.patch
+++ b/custom-rubygems-location.patch
@@@ -1,4 -1,4 +1,4 @@@
--From 94da59aafacc6a9efe829529eb51385588d6f149 Mon Sep 17 00:00:00 2001
++From c7952996ac9738a14bea0a1a971fea13460a6c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Fri, 11 Nov 2011 13:14:45 +0100
Subject: [PATCH] Allow to install RubyGems into custom location, outside of
@@@ -12,13 -12,13 +12,13 @@@
4 files changed, 22 insertions(+)
diff --git a/configure.ac b/configure.ac
- index 6bba453e3c..028ef7ca3e 100644
-index 93af30321d..bc13397e0e 100644
++index 411322a27f..b5f842a512 100644
--- a/configure.ac
+++ b/configure.ac
- @@ -3746,6 +3746,10 @@ AC_ARG_WITH(vendorarchdir,
-@@ -4232,6 +4232,10 @@ AC_ARG_WITH(vendorarchdir,
++@@ -4508,6 +4508,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
--
++
+AC_ARG_WITH(rubygemsdir,
+ AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
+ [rubygemsdir=$withval])
@@@ -26,22 -26,22 +26,22 @@@
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
- @@ -3770,6 +3774,7 @@ AC_SUBST(sitearchdir)dnl
-@@ -4256,6 +4260,7 @@ AC_SUBST(sitearchdir)dnl
++@@ -4532,6 +4536,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
+AC_SUBST(rubygemsdir)dnl
--
++
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
diff --git a/loadpath.c b/loadpath.c
--index 623dc9d..74c5d9e 100644
++index bbfd4daa78..69677a9297 100644
--- a/loadpath.c
+++ b/loadpath.c
@@ -94,6 +94,10 @@ const char ruby_initial_load_paths[] =
#endif
#endif
--
++
+#ifdef RUBYGEMS_DIR
+ RUBYGEMS_DIR "\0"
+#endif
@@@ -50,7 -50,7 +50,7 @@@
#ifdef RUBY_THINARCH
RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
--index 79c003e..34f2382 100644
++index 9ba2bd6de5..4ec4ce9353 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
@@ -36,6 +36,9 @@
@@@ -64,18 -64,18 +64,18 @@@
% R = {}
% R["ruby_version"] = '"RUBY_LIB_VERSION"'
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
- index b47b6e1..0b99408 100755
-index e9110a17ca..76a1f0a315 100755
++index a9e6365b27..7117e65e82 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
- @@ -330,6 +330,7 @@
- archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
- rubylibdir = CONFIG["rubylibdir", true]
- archlibdir = CONFIG["rubyarchdir", true]
-@@ -359,6 +359,7 @@ def CONFIG.[](name, mandatory = false)
++@@ -393,6 +393,7 @@ def CONFIG.[](name, mandatory = false)
+ vendorlibdir = CONFIG["vendorlibdir"]
+ vendorarchlibdir = CONFIG["vendorarchdir"]
+ end
+rubygemsdir = CONFIG["rubygemsdir"]
- if CONFIG["sitedir"]
- sitelibdir = CONFIG["sitelibdir"]
- sitearchlibdir = CONFIG["sitearchdir"]
- @@ -560,7 +561,16 @@ def stub
+ mandir = CONFIG["mandir", true]
+ docdir = CONFIG["docdir", true]
+ enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -595,7 +596,16 @@ def stub
++@@ -1082,7 +1083,16 @@ def (bins = []).add(name)
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[*.txt *.rdoc *.gemspec]
@@@ -90,8 -90,5 +90,5 @@@
+ install(File.join(srcdir, "lib", "bundler.rb"), rubylibdir, :mode => $data_mode)
+ end
end
--
- install?(:local, :comm, :hdr, :'comm-hdr') do
- --
- 1.8.3.1
+
+ install?(:local, :comm, :hdr, :'comm-hdr') do
diff --cc duplicated-paths.patch
index bfb197f,bfb197f..9ccd089
--- a/duplicated-paths.patch
+++ b/duplicated-paths.patch
@@@ -1,4 -1,4 +1,4 @@@
--From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001
++From 6062f4976c5b51f8b952b9f6745175be7b1c5ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Fri, 8 Feb 2013 22:48:41 +0100
Subject: [PATCH] Prevent duplicated paths when empty version string is
@@@ -11,21 -11,21 +11,21 @@@
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
--index 999e2d6d5d..11fc237552 100644
++index 2bc5153141..a64358fada 100644
--- a/configure.ac
+++ b/configure.ac
--@@ -3710,7 +3710,8 @@ AS_CASE(["$ruby_version_dir_name"],
++@@ -4472,7 +4472,8 @@ AS_CASE(["$ruby_version_dir_name"],
ruby_version_dir=/'${ruby_version_dir_name}'
--
++
if test -z "${ruby_version_dir_name}"; then
- AC_MSG_ERROR([No ruby version, No place for bundled libraries])
+ unset ruby_version_dir
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
fi
--
++
rubylibdir='${rubylibprefix}'${ruby_version_dir}
diff --git a/loadpath.c b/loadpath.c
--index 9160031..0d4d953 100644
++index b8969e6998..bbfd4daa78 100644
--- a/loadpath.c
+++ b/loadpath.c
@@ -65,21 +65,33 @@ const char ruby_initial_load_paths[] =
@@@ -45,7 -45,7 +45,7 @@@
RUBY_SITE_LIB "\0"
#endif
+#endif
--
++
#ifndef NO_RUBY_VENDOR_LIB
+#ifdef RUBY_LIB_VERSION_BLANK
+ RUBY_VENDOR_LIB "\0"
@@@ -60,10 -60,10 +60,10 @@@
RUBY_VENDOR_LIB "\0"
+#endif
#endif
--
++
RUBY_LIB "\0"
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
--index 07076d4..35e6c3c 100755
++index db74115730..2b01796abf 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -114,7 +114,7 @@
@@@ -75,6 -75,6 +75,3 @@@
when /^ARCH_FLAG$/
val = "arch_flag || #{val}" if universal
when /^UNIVERSAL_ARCHNAMES$/
----
--1.9.0
--
diff --cc mkmf-verbose.patch
index eb9145c,2113bea..0000000
deleted file mode 100644,100644
--- a/mkmf-verbose.patch
+++ /dev/null
@@@ -1,25 -1,25 +1,0 @@@
--From 28cc0749d6729aa2444661ee7b411e183fe220b0 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
--Date: Mon, 19 Nov 2012 15:14:51 +0100
--Subject: [PATCH] Verbose mkmf.
--
-----
-- lib/mkmf.rb | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
--
--diff --git a/lib/mkmf.rb b/lib/mkmf.rb
--index 682eb46..e6b1445 100644
----- a/lib/mkmf.rb
--+++ b/lib/mkmf.rb
- @@ -1892,7 +1892,7 @@ def configuration(srcdir)
-@@ -1974,7 +1974,7 @@ def configuration(srcdir)
-- SHELL = /bin/sh
--
-- # V=0 quiet, V=1 verbose. other values don't work.
---V = 0
--+V = 1
- V0 = $(V:0=)
-- Q1 = $(V:1=)
-- Q = $(Q1:0=@)
- ECHO1 = $(V:1=@ #{CONFIG['NULLCMD']})
----
--1.8.3.1
--
diff --cc openssl3.patch
index acc7d3c,acc7d3c..0000000
deleted file mode 100644,100644
--- a/openssl3.patch
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
----- ruby-2.6.8/ext/openssl/ossl_pkey_rsa.c.orig 2021-07-07 12:38:58.000000000 +0200
--+++ ruby-2.6.8/ext/openssl/ossl_pkey_rsa.c 2021-10-13 12:03:34.317085257 +0200
--@@ -939,7 +939,9 @@
-- rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
--
-- DefRSAConst(PKCS1_PADDING);
--+#if OPENSSL_VERSION_MAJOR < 3
-- DefRSAConst(SSLV23_PADDING);
--+#endif
-- DefRSAConst(NO_PADDING);
-- DefRSAConst(PKCS1_OAEP_PADDING);
--
diff --cc ruby-version.patch
index 43ed045,866fef4..80ec49d
--- a/ruby-version.patch
+++ b/ruby-version.patch
@@@ -1,4 -1,4 +1,4 @@@
--From 4fc1be3af3f58621bb751c9e63c208b15c0e8d16 Mon Sep 17 00:00:00 2001
++From 5406ea4b4b13db747e5c1f8341bb257b4da04435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Tue, 31 Mar 2015 16:21:04 +0200
Subject: [PATCH 1/4] Use ruby_version_dir_name for versioned directories.
@@@ -12,28 -12,28 +12,28 @@@ ruby_version_dir_name now specifies cus
directories, e.g. instead of default X.Y.Z, you can specify whatever
string.
---
- configure.ac | 64 ++++++++++++++++++++++++---------------------
+ configure.ac | 66 ++++++++++++++++++++++++---------------------
template/ruby.pc.in | 1 +
- 2 files changed, 35 insertions(+), 30 deletions(-)
+ 2 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
- index 8ea969412f..a00f2b6776 100644
-index 80b137e380..63cd3b4f8b 100644
++index 2bbce78fd0..9d8662369c 100644
--- a/configure.ac
+++ b/configure.ac
- @@ -3661,9 +3661,6 @@ AS_CASE(["$target_os"],
-@@ -4146,9 +4146,6 @@ AS_CASE(["$target_os"],
++@@ -4422,9 +4422,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
--
++
-rubylibdir='${rubylibprefix}/${ruby_version}'
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
-
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
AS_HELP_STRING([--with-rubyarchprefix=DIR],
- @@ -3686,56 +3683,62 @@ AC_ARG_WITH(ridir,
-@@ -4171,57 +4168,63 @@ AC_ARG_WITH(ridir,
++@@ -4447,57 +4444,63 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
--
++
-AC_ARG_WITH(ruby-version,
- AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
- [ruby_version=$withval],
@@@ -73,7 -75,7 +75,7 @@@
+
AC_SUBST(RUBY_LIB_VERSION_STYLE)
AC_SUBST(RUBY_LIB_VERSION)
--
++
+AC_ARG_WITH(ruby-version,
+ AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|STR)]),
+ [ruby_version_dir_name=$withval],
@@@ -96,31 -98,31 +98,31 @@@
[sitedir='${rubylibprefix}/site_ruby'])
-sitelibdir='${sitedir}/${ruby_version}'
+sitelibdir='${sitedir}'${ruby_version_dir}
--
++
AC_ARG_WITH(sitearchdir,
AS_HELP_STRING([--with-sitearchdir=DIR],
[architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
[sitearchdir=$withval],
- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
+ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_dir}}${multiarch-'${sitelibdir}/${sitearch}'}])
--
++
AC_ARG_WITH(vendordir,
AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
[vendordir=$withval],
[vendordir='${rubylibprefix}/vendor_ruby'])
-vendorlibdir='${vendordir}/${ruby_version}'
+vendorlibdir='${vendordir}'${ruby_version_dir}
--
++
AC_ARG_WITH(vendorarchdir,
AS_HELP_STRING([--with-vendorarchdir=DIR],
[architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
[vendorarchdir=$withval],
- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+ [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
--
++
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
- @@ -3752,6 +3755,7 @@ AC_SUBST(sitearchincludedir)dnl
-@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl
++@@ -4514,6 +4517,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@@@ -129,50 -131,48 +131,34 @@@
AC_SUBST(rubyarchdir)dnl
AC_SUBST(sitedir)dnl
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
--index 8a2c066..c81b211 100644
++index 6901ec2320..9b7b787208 100644
--- a/template/ruby.pc.in
+++ b/template/ruby.pc.in
- @@ -9,6 +9,7 @@ MAJOR=@MAJOR@
+ @@ -2,6 +2,7 @@ MAJOR=@MAJOR@
MINOR=@MINOR@
TEENY=@TEENY@
ruby_version=@ruby_version@
+ruby_version_dir_name=@ruby_version_dir_name@
RUBY_API_VERSION=@RUBY_API_VERSION@
RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
- RUBY_BASE_NAME=@RUBY_BASE_NAME@
- --
- 2.1.0
+ arch=@arch@
--From 518850aba6eee76de7715aae8d37330e34b01983 Mon Sep 17 00:00:00 2001
++From baff562149499973123d2187620201be641c6538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Tue, 31 Mar 2015 16:37:26 +0200
Subject: [PATCH 2/4] Add ruby_version_dir_name support for RDoc.
---
-- lib/rdoc/ri/paths.rb | 2 +-
-- tool/rbinstall.rb | 2 +-
-- 2 files changed, 2 insertions(+), 2 deletions(-)
--
--diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
--index 970cb91..5bf8230 100644
----- a/lib/rdoc/ri/paths.rb
--+++ b/lib/rdoc/ri/paths.rb
--@@ -10,7 +10,7 @@ module RDoc::RI::Paths
-- #:stopdoc:
-- require 'rbconfig'
--
--- version = RbConfig::CONFIG['ruby_version']
--+ version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
--
- BASE = if RbConfig::CONFIG.key? 'ridir' then
- File.join RbConfig::CONFIG['ridir'], version
- BASE = File.join RbConfig::CONFIG['ridir'], version
-
++ tool/rbinstall.rb | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
--index d4c110e..d39c9a6 100755
++index 874c3ef1d9..a9e6365b27 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
- @@ -424,7 +424,7 @@ def CONFIG.[](name, mandatory = false)
-@@ -453,7 +453,7 @@ def CONFIG.[](name, mandatory = false)
--
++@@ -1053,7 +1053,7 @@ def (bins = []).add(name)
++
install?(:doc, :rdoc) do
if $rdocdir
- ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
@@@ -180,95 -180,75 +166,76 @@@
prepare "rdoc", ridatadir
install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
end
- --
- 2.1.0
-From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
+
- From f8d136f9a46d1fe87eba622ab9665935d05e981b Mon Sep 17 00:00:00 2001
++From 7cf872a9a34f38d71cd2ca04ac114b4ea85cc56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Tue, 31 Mar 2015 16:37:44 +0200
Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
---
- lib/rubygems/defaults.rb | 11 ++++++-----
- test/rubygems/test_gem.rb | 5 +++--
- 2 files changed, 9 insertions(+), 7 deletions(-)
+ lib/rubygems/defaults.rb | 7 ++++---
+ test/rubygems/test_gem.rb | 5 +++--
+ 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
- index 55ca080..75eea2b 100644
-index d4ff4a262c..3f9a5bf590 100644
++index 90f09fc191..f6b8a03b95 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
- @@ -32,20 +32,20 @@ def self.default_dir
- [
- File.dirname(RbConfig::CONFIG['sitedir']),
- 'Gems',
- - RbConfig::CONFIG['ruby_version']
- + RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
- ]
- elsif RbConfig::CONFIG['rubylibprefix']
- [
- RbConfig::CONFIG['rubylibprefix'],
- 'gems',
- - RbConfig::CONFIG['ruby_version']
- + RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
- ]
- else
- [
- RbConfig::CONFIG['libdir'],
- ruby_engine,
- 'gems',
- - RbConfig::CONFIG['ruby_version']
- + RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
- ]
- end
-
- @@ -75,7 +75,8 @@ def self.default_rubygems_dirs
-
- def self.user_dir
- parts = [Gem.user_home, '.gem', ruby_engine]
- - parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
- + ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
-@@ -34,7 +34,7 @@ def self.default_spec_cache_dir
++@@ -35,7 +35,7 @@ def self.default_spec_cache_dir
+ # specified in the environment
-
++
+ def self.default_dir
+ - @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version"])
+ + @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"])
+ end
-
++
+ ##
-@@ -103,7 +103,8 @@ def self.user_dir
++@@ -104,7 +104,8 @@ def self.user_dir
+ gem_dir = File.join(Gem.user_home, ".gem")
+ gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
+ parts = [gem_dir, ruby_engine]
+ - parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
+ + ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
File.join parts
end
-
- @@ -172,7 +173,7 @@ def self.vendor_dir # :nodoc:
- return nil unless RbConfig::CONFIG.key? 'vendordir'
--
- File.join RbConfig::CONFIG['vendordir'], 'gems',
- - RbConfig::CONFIG['ruby_version']
- + RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
-@@ -248,7 +249,7 @@ def self.vendor_dir # :nodoc:
++
++@@ -265,7 +266,7 @@ def self.vendor_dir # :nodoc:
+ return nil unless RbConfig::CONFIG.key? "vendordir"
-
++
+ File.join RbConfig::CONFIG["vendordir"], "gems",
+ - RbConfig::CONFIG["ruby_version"]
+ + RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
end
--
++
##
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
- index 0428bea..b6e090e 100644
-index b25068405d..e9fef4a311 100644
++index 74c8953904..1f3bd91d51 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
- @@ -1288,7 +1288,8 @@ def test_self_use_paths
-@@ -1337,7 +1337,8 @@ def test_self_use_paths
--
++@@ -1339,7 +1339,8 @@ def test_self_use_paths
++
def test_self_user_dir
- parts = [@userhome, '.gem', Gem.ruby_engine]
- - parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
- + ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ parts = [@userhome, ".gem", Gem.ruby_engine]
+ - parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
+ + ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
-
- assert_equal File.join(parts), Gem.user_dir
- end
- @@ -1365,7 +1366,7 @@ def test_self_gzip
- def test_self_vendor_dir
- expected =
- File.join RbConfig::CONFIG['vendordir'], 'gems',
- - RbConfig::CONFIG['ruby_version']
- + RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
--
- assert_equal expected, Gem.vendor_dir
- end
- --
- 2.1.0
++
+ FileUtils.mkdir_p File.join(parts)
-
-@@ -1413,7 +1414,7 @@ def test_self_vendor_dir
++
++@@ -1415,7 +1416,7 @@ def test_self_vendor_dir
+ vendordir(File.join(@tempdir, "vendor")) do
+ expected =
+ File.join RbConfig::CONFIG["vendordir"], "gems",
+ - RbConfig::CONFIG["ruby_version"]
+ + RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
-
++
+ assert_equal expected, Gem.vendor_dir
+ end
--From 88c38a030c22dbf9422ece847bdfbf87d6659313 Mon Sep 17 00:00:00 2001
++From 17cb98b7b78f8bfc511feffbe061747f676055b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Wed, 1 Apr 2015 14:55:37 +0200
Subject: [PATCH 4/4] Let headers directories follow the configured version
@@@ -279,18 -259,15 +246,15 @@@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
--index a00f2b6776..999e2d6d5d 100644
++index 9d8662369c..2bc5153141 100644
--- a/configure.ac
+++ b/configure.ac
- @@ -101,7 +101,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
-@@ -124,7 +124,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
++@@ -151,7 +151,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
AC_SUBST(RUBY_BASE_NAME)
AC_SUBST(RUBYW_BASE_NAME)
-AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
+AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version_dir_name}')
--
- AC_CANONICAL_TARGET
- test x"$target_alias" = x &&
- --
- 2.1.0
+
+ dnl checks for alternative programs
+ AC_CANONICAL_BUILD
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/429859eec618524407f62d38da8756b3bfad5114
More information about the pld-cvs-commit
mailing list