[packages/ruby/DEVEL-3.2] ruby 3.2.6
mis
mis at pld-linux.org
Thu Feb 13 16:45:56 CET 2025
commit 77f7339809004149ebd2ebc4f9eb59047b8e90f4
Author: mis <mistoo at gmail.com>
Date: Thu Feb 13 16:11:40 2025 +0100
ruby 3.2.6
custom-rubygems-location.patch | 27 ++++-----
ruby-version.patch | 62 +++++++++----------
ruby.spec | 132 +++++++++++++++++++++++++----------------
3 files changed, 120 insertions(+), 101 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 0d056cc..e947c7c 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -12,9 +12,9 @@
%bcond_with bootstrap # build bootstrap version
%bcond_with tests # build without tests
-%define rel 0.2
-%define ruby_version 3.1
-%define patchlevel 2
+%define rel 1
+%define ruby_version 3.2
+%define patchlevel 6
%define pkg_version %{ruby_version}.%{patchlevel}
%define ruby_suffix %{!?with_default_ruby:%{ruby_version}}
%define doc_version 3_1_2
@@ -37,11 +37,11 @@ License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
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: e2c35af69d1f94e8634f38c80e809c0d
+# Source0-md5: 4aba8fc5ba0e0793ab08f0cbf4c6fd44
Source2: https://ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
# Source2-md5: d8b945c2da4f60d9ea2886e163f0203c
Source3: https://ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: abc2819f7f161acb7be4774f86d3828c
+# Source3-md5: e846af5c895c4277cb06f20a528c04b6
%if 0
Source50: https://www.unicode.org/Public/%{unicode_version}/ucd/CaseFolding.txt
# Source50-md5: e3fbf2f626f10070000fe66f3a2ff5ef
@@ -58,7 +58,7 @@ Source4: rdoc.1
Source5: testrb.1
Source6: operating_system.rb
Patch2: fix-bison-invocation.patch
-Patch3: mkmf-verbose.patch
+#Patch3: mkmf-verbose.patch
Patch4: strip-ccache.patch
Patch5: ruby-version.patch
Patch6: duplicated-paths.patch
@@ -70,9 +70,11 @@ BuildRequires: autoconf >= 2.67
BuildRequires: automake
BuildRequires: bison >= 1.875
BuildRequires: db-devel
+BuildRequires: gcc-c++
BuildRequires: gdbm-devel >= 1.8.3
BuildRequires: gmp-devel
BuildRequires: libffi-devel
+BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel >= 0.9.6
BuildRequires: pkgconfig
@@ -106,38 +108,50 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# hack: skip rubygem(ipaddr)
%define _noautoreq ipaddr
-# generated by extract-gem-versions.sh
-%define bigdecimal_ver 3.1.1
-%define bundler_ver 2.3.7
-%define erb_ver 2.2.3
-%define io_console_ver 0.5.11
-%define irb_ver 1.4.1
-%define json_ver 2.6.1
-%define etc_ver 1.3.0
-%define stringio_ver 3.0.1
-%define zlib_ver 2.1.1
-%define openssl_ver 3.0.0
-%define psych_ver 4.0.3
-%define racc_ver 1.6.0
-%define rdoc_ver 6.4.0
-%define readline_ver 0.1.4
-%define rubygems_ver 3.3.7
-# bundled
-%define debug_ver 1.4.0
-%define matrix_ver 0.4.2
-%define minitest_ver 5.15.0
-%define net_ftp_ver 0.1.3
-%define net_imap_ver 0.2.3
-%define net_pop_ver 0.1.1
-%define net_smtp_ver 0.3.1
-%define power_assert_ver 2.0.1
-%define prime_ver 0.1.2
-%define rake_ver 13.0.6
-%define rbs_ver 2.1.0
-%define rexml_ver 3.2.5
-%define rss_ver 0.2.9
-%define test_unit_ver 3.5.3
-%define typeprof_ver 0.21.2
+%define rubygems_ver 3.4.19
+%define rubygems_molinillo_ver 0.8.0
+%define rubygems_optparse_ver 0.3.0
+%define rubygems_tsort_ver 0.1.0
+
+# Default gems.
+%define bundler_ver 2.4.19
+%define bundler_connection_pool_ver 2.3.0
+%define bundler_fileutils_ver 1.7.0
+%define bundler_pub_grub_ver 0.5.0
+%define bundler_net_http_persistent_ver 4.0.1
+%define bundler_thor_ver 1.2.1
+%define bundler_tsort_ver 0.1.1
+%define bundler_uri_ver 0.12.1
+
+%define bigdecimal_ver 3.1.3
+%define did_you_mean_ver 1.6.3
+%define erb_ver 4.0.2
+%define io_console_ver 0.6.0
+%define irb_ver 1.6.2
+%define json_ver 2.6.3
+%define openssl_ver 3.1.0
+%define psych_ver 5.0.1
+%define racc_ver 1.6.2
+%define rdoc_ver 6.5.1.1
+%define stringio_ver 3.0.4
+
+# Bundled gems.
+%define minitest_ver 5.16.3
+%define power_assert_ver 2.0.3
+%define rake_ver 13.0.6
+%define test_unit_ver 3.5.7
+%define rexml_ver 3.3.9
+%define rss_ver 0.3.1
+%define net_ftp_ver 0.2.1
+%define net_imap_ver 0.3.4.1
+%define net_pop_ver 0.1.2
+%define net_smtp_ver 0.3.4
+%define matrix_ver 0.4.2
+%define prime_ver 0.1.2
+%define rbs_ver 2.8.2
+%define typeprof_ver 0.21.3
+%define debug_ver 1.7.1
+
%define ruby_ridir %{_datadir}/ri/system
%define gem_dir %{_datadir}/gems
@@ -662,7 +676,7 @@ these needs to be listed in Gemfile to be used by Bundler.
%prep
%setup -q -n %{oname}-%{pkg_version} -a2 -a3
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -671,9 +685,9 @@ these needs to be listed in Gemfile to be used by Bundler.
# (from rawhide) Once the upstream tarball contains the files on the right place, this code
# won't be necessary. This should happen at the same moment when the patch10
# is not needed anymore.
-mkdir .bundle/specifications
-find .bundle/gems -name '*-[0-9]*.gemspec' -exec cp -t .bundle/specifications/ {} +
-%patch10 -p1
+##mkdir .bundle/specifications
+#find .bundle/gems -name '*-[0-9]*.gemspec' -exec cp -t .bundle/specifications/ {} +
+#%patch10 -p1
%patch12 -p1
%if 0
@@ -685,8 +699,8 @@ cp -p %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} %{SOURCE54} enc/unicode/da
%{__rm} parse.{c,h}
# Remove bundled libraries to be sure they are not used.
-%{__rm} -r ext/psych/yaml
-%{__rm} -r ext/fiddle/libffi*
+#%{__rm} -r ext/psych/yaml
+#%{__rm} -r ext/fiddle/libffi*
# Install custom operating_system.rb.
install -d lib/rubygems/defaults
@@ -734,6 +748,8 @@ cp -f /usr/share/automake/config.sub .
--with-sitearchhdrdir='$(sitehdrdir)/$(arch)' \
--with-vendorarchhdrdir='$(vendorhdrdir)/$(arch)' \
--without-compress-debug-sections \
+ --enable-mkmf-verbose \
+ --enable-yjit \
--enable-multiarch \
--enable-shared \
--disable-install-doc \
@@ -911,6 +927,8 @@ find $RPM_BUILD_ROOT${gem_dir}/extensions/*-%{_target_os}/%{ruby_version}.*/* -m
# replace default irb with its not gemified version
%{__mv} $RPM_BUILD_ROOT%{gem_dir}/gems/irb-%{irb_ver}/exe/irb $RPM_BUILD_ROOT%{_bindir}/irb%{ruby_suffix}
+# add ruby_suffix to syntax_suggest
+[ -n "%{ruby_suffix}" ] && mv $RPM_BUILD_ROOT%{_bindir}/syntax_suggest $RPM_BUILD_ROOT%{_bindir}/syntax_suggest%{ruby_suffix}
# Adjust the gemspec files so that the gems will load properly
sed -i '/^end$/ i\
@@ -954,24 +972,25 @@ done
$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}/exe/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}/*.rb
# gem non library files
%{__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/net-ftp-%{net_ftp_ver}/{[A-Z]*,bin}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-pop-%{net_pop_ver}/{[A-Z]*,bin}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-imap-%{net_imap_ver}/[A-Z]*
+%{__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-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/debug-%{debug_ver}/{[A-Z]*,bin,misc,ext}
+%{__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/racc-%{racc_ver}/bin $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]*,test}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rss-%{rss_ver}/[A-Z]*
%if %{without batteries}
# packaged separately
@@ -1191,6 +1210,8 @@ rm -rf $RPM_BUILD_ROOT
%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}
@@ -1209,9 +1230,11 @@ rm -rf $RPM_BUILD_ROOT
%{gem_dir}/gems/prime-%{prime_ver}/lib
%{gem_dir}/specifications/prime-%{prime_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
@@ -1227,7 +1250,6 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/test
%{ruby_libdir}/uri
%{ruby_libdir}/yaml
-
%{ruby_libdir}/English.rb
%{ruby_libdir}/abbrev.rb
%{ruby_libdir}/base64.rb
@@ -1251,7 +1273,7 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/error_highlight/*.rb
%{ruby_libdir}/erb.rb
%dir %{ruby_libdir}/erb
-%{ruby_libdir}/erb/version.rb
+%{ruby_libdir}/erb/*.rb
%{ruby_libdir}/expect.rb
%{ruby_libdir}/fiddle.rb
%{ruby_libdir}/fileutils.rb
@@ -1299,6 +1321,8 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/resolv-replace.rb
%{ruby_libdir}/resolv.rb
%{ruby_libdir}/ripper.rb
+%dir %{ruby_libdir}/ruby_vm
+%{ruby_libdir}/ruby_vm/mjit
%{ruby_libdir}/securerandom.rb
%{ruby_libdir}/set.rb
%dir %{ruby_libdir}/set
@@ -1306,6 +1330,11 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/shellwords.rb
%{ruby_libdir}/singleton.rb
%{ruby_libdir}/socket.rb
+%{ruby_libdir}/syntax_suggest.rb
+%dir %{ruby_libdir}/syntax_suggest
+%{ruby_libdir}/syntax_suggest/*.rb
+%dir %{ruby_libdir}/syntax_suggest/capture
+%{ruby_libdir}/syntax_suggest/capture/*.rb
%{ruby_libdir}/tempfile.rb
%{ruby_libdir}/time.rb
%{ruby_libdir}/timeout.rb
@@ -1330,6 +1359,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{ruby_archdir}/date_core.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}/fiddle.so
%attr(755,root,root) %{ruby_archdir}/monitor.so
diff --git a/custom-rubygems-location.patch b/custom-rubygems-location.patch
index 431ce5b..0cb2012 100644
--- a/custom-rubygems-location.patch
+++ b/custom-rubygems-location.patch
@@ -12,10 +12,10 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of
4 files changed, 22 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 6bba453e3c..028ef7ca3e 100644
+index 93af30321d..bc13397e0e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3746,6 +3746,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4232,6 +4232,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
@@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644
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
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
@@ -64,18 +64,18 @@ index 79c003e..34f2382 100644
% 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
--- 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)
+ 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
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[*.txt *.rdoc *.gemspec]
@@ -92,6 +92,3 @@ index b47b6e1..0b99408 100755
end
install?(:local, :comm, :hdr, :'comm-hdr') do
---
-1.8.3.1
-
diff --git a/ruby-version.patch b/ruby-version.patch
index 1f42472..866fef4 100644
--- a/ruby-version.patch
+++ b/ruby-version.patch
@@ -12,15 +12,15 @@ ruby_version_dir_name now specifies custom version string for versioned
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 80b137e380..63cd3b4f8b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3977,9 +3977,6 @@ AS_CASE(["$target_os"],
+@@ -4146,9 +4146,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
@@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4002,56 +3999,62 @@ AC_ARG_WITH(ridir,
+@@ -4171,57 +4168,63 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@@ -46,6 +46,7 @@ index 80b137e380..63cd3b4f8b 100644
-AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
- {
- echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+- echo '@%:@include "confdefs.h"'
- echo '#define STRINGIZE(x) x'
- test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
- echo '#include "version.h"'
@@ -61,6 +62,7 @@ index 80b137e380..63cd3b4f8b 100644
+RUBY_LIB_VERSION_STYLE='3 /* full */'
+{
+echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
++echo '@%:@include "confdefs.h"'
+echo '#define STRINGIZE(x) x'
+test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+echo '#include "version.h"'
@@ -120,7 +122,7 @@ index 80b137e380..63cd3b4f8b 100644
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4068,6 +4071,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@@ -140,8 +142,6 @@ index 8a2c066..c81b211 100644
RUBY_API_VERSION=@RUBY_API_VERSION@
RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
arch=@arch@
---
-2.1.0
From 518850aba6eee76de7715aae8d37330e34b01983 Mon Sep 17 00:00:00 2001
@@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index d4c110e..d39c9a6 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
-@@ -448,7 +448,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -453,7 +453,7 @@ def CONFIG.[](name, mandatory = false)
install?(:doc, :rdoc) do
if $rdocdir
@@ -180,9 +180,6 @@ index d4c110e..d39c9a6 100755
prepare "rdoc", ridatadir
install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
end
---
-2.23.0
-
From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
@@ -202,8 +199,8 @@ index d4ff4a262c..3f9a5bf590 100644
# 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'])
+- @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
##
@@ -211,18 +208,18 @@ index d4ff4a262c..3f9a5bf590 100644
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 << 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
-@@ -234,7 +235,7 @@ def self.vendor_dir # :nodoc:
- return nil unless RbConfig::CONFIG.key? 'vendordir'
+@@ -248,7 +249,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']
+ File.join RbConfig::CONFIG["vendordir"], "gems",
+- RbConfig::CONFIG["ruby_version"]
++ RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
end
##
@@ -230,27 +227,25 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index b25068405d..e9fef4a311 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
-@@ -1410,7 +1410,8 @@ def test_self_use_paths
+@@ -1337,7 +1337,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?
FileUtils.mkdir_p File.join(parts)
-@@ -1486,7 +1487,7 @@ def test_self_vendor_dir
- vendordir(File.join(@tempdir, 'vendor')) do
+@@ -1413,7 +1414,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']
+ 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
From 88c38a030c22dbf9422ece847bdfbf87d6659313 Mon Sep 17 00:00:00 2001
@@ -267,7 +262,7 @@ diff --git a/configure.ac b/configure.ac
index a00f2b6776..999e2d6d5d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -108,7 +108,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+@@ -124,7 +124,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)
@@ -276,6 +271,3 @@ index a00f2b6776..999e2d6d5d 100644
dnl checks for alternative programs
AC_CANONICAL_BUILD
---
-2.1.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/77f7339809004149ebd2ebc4f9eb59047b8e90f4
More information about the pld-cvs-commit
mailing list