Browse Source

ruby: update to 2.4.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11052 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 7 years ago
parent
commit
78a4045d93
1 changed files with 53 additions and 51 deletions
  1. 53 51
      r/ruby/ruby-vl.spec

+ 53 - 51
r/ruby/ruby-vl.spec

@@ -1,6 +1,6 @@
 %global major_version 2
-%global minor_version 2
-%global teeny_version 4
+%global minor_version 4
+%global teeny_version 1
 
 %global major_minor_version %{major_version}.%{minor_version}
 
@@ -24,7 +24,7 @@
 %global ruby_vendorlibdir %{_prefix}/share/ruby/%{ruby_vendordir}
 %global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}
 
-%global rubygems_version 2.4.5
+%global rubygems_version 2.6.8
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
@@ -39,15 +39,16 @@
 # http://redmine.ruby-lang.org/issues/5313
 %global irb_version %{ruby_version}
 
-%global rake_version 10.4.2
-%global rdoc_version 4.2.0
-%global bigdecimal_version 1.2.6
-%global io_console_version 0.4.3
-%global json_version 1.8.1
-%global minitest_version 5.4.3
-%global psych_version 2.0.8
-%global power_assert_version 0.2.2
-%global test_unit_version 3.0.8
+%global rake_version 12.0.0
+%global rdoc_version 5.0.0
+%global bigdecimal_version 1.3.0
+%global io_console_version 0.4.6
+%global json_version 2.0.2
+%global minitest_version 5.10.1
+%global psych_version 2.2.2
+%global power_assert_version 0.4.1
+%global test_unit_version 3.2.3
+%global xmlrpc_version 0.2.1
 
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
@@ -55,7 +56,7 @@
 # is updated - because it may be that the versions of sub-components don't
 # change.
 # rubyのmainバージョンが更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 12
+%global ruby_rel 14
 
 %bcond_without emacsen
 %define rbmode          ruby-mode
@@ -113,6 +114,9 @@ Requires: ruby(rubygems) >= %{rubygems_version}
 # and http://bugs.ruby-lang.org/issues/6123
 Requires: rubygem(bigdecimal) >= %{bigdecimal_version}
 
+# Tcl/Tk was dropped from stdlib
+Obsoletes: ruby-tcltk < 2.4.0
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
@@ -123,8 +127,6 @@ BuildRequires: libffi-devel
 BuildRequires: openssl-devel
 BuildRequires: libyaml-devel
 BuildRequires: readline-devel
-BuildRequires: tcl-devel
-BuildRequires: tk-devel
 BuildRequires: libX11-devel
 BuildRequires: zlib-devel
 # Needed to pass test_set_program_name(TestRubyOptions)
@@ -432,18 +434,19 @@ bundled in Ruby 1.8.x had not been improved but unbundled
 Test::Unit (test-unit) is improved actively.
 
 
-%package tcltk
-Summary:    Tcl/Tk interface for scripting language Ruby
-Summary(ja): RubyのTcl/Tkインタフェースライブラリ
-Group:      Development/Languages
-Requires:   %{name}-libs = %{ruby_version}
-Provides:   ruby(tcltk) = %{ruby_version}-%{release}
-
-%description tcltk
-Tcl/Tk interface for the object-oriented scripting language Ruby.
+%package -n rubygem-xmlrpc
+Summary:    XMLRPC is a lightweight protocol that enables remote procedure calls over H TTP
+Version:    %{xmlrpc_version}
+Group:      Development/Libraries
+License:    Ruby or BSD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(xmlrpc) = %{version}-%{release}
+BuildArch:  noarch
 
-%description -n ruby-tcltk -l ja
-RubyにTcl/Tkライブラリへのインタフェースを提供する拡張ライブラリです.
+%description -n rubygem-xmlrpc
+XMLRPC is a lightweight protocol that enables remote procedure calls
+over HTTP.
 
 
 %if %{with emacsen}
@@ -568,10 +571,10 @@ mkdir -p %{buildroot}%{gem_extdirs}/exts
 # Move bundled rubygems to %%gem_dir and %%gem_extdir
 # make symlinks for io-console and bigdecimal, 
 # which are considered to be part of stdlib by other Gems
+
 ## rake
-mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}/lib
-mv %{buildroot}%{ruby_libdir}/%{ruby_release}/rake* %{buildroot}%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}/lib
-mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/rake-%{rake_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
+# Move man pages into proper location
+mv %{buildroot}%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
 
 ## rdoc
 mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}/lib
@@ -704,9 +707,6 @@ fi
 %{_mandir}/man1/erb*
 %{_mandir}/man1/ruby*
 
-# http://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries
-%exclude %{_libdir}/libruby-static.a
-
 %files devel
 %doc COPYING*
 %doc GPL
@@ -725,7 +725,7 @@ fi
 %lang(ja) %doc COPYING.ja
 %doc GPL
 %doc LEGAL
-%doc README
+%doc README.md
 %lang(ja) %doc README.ja
 %doc NEWS
 %doc doc/NEWS-*
@@ -739,14 +739,12 @@ fi
 %dir %{ruby_libdir}
 %dir %{ruby_libdir}/%{ruby_release}
 %{ruby_libdir}/%{ruby_release}/*.rb
-%exclude %{ruby_libdir}/%{ruby_release}/*-tk.rb
 %exclude %{ruby_libdir}/%{ruby_release}/irb.rb
-%exclude %{ruby_libdir}/%{ruby_release}/tcltk.rb
-%exclude %{ruby_libdir}/%{ruby_release}/tk*.rb
 %{ruby_libdir}/%{ruby_release}/cgi
 %{ruby_libdir}/%{ruby_release}/digest
 %{ruby_libdir}/%{ruby_release}/drb
 %{ruby_libdir}/%{ruby_release}/fiddle
+%{ruby_libdir}/%{ruby_release}/forwardable
 %exclude %{ruby_libdir}/%{ruby_release}/irb
 %{ruby_libdir}/%{ruby_release}/matrix
 %{ruby_libdir}/%{ruby_release}/net
@@ -761,17 +759,17 @@ fi
 %{ruby_libdir}/%{ruby_release}/rss
 %{ruby_libdir}/%{ruby_release}/shell
 %{ruby_libdir}/%{ruby_release}/syslog
-%exclude %{ruby_libdir}/%{ruby_release}/tk
-%exclude %{ruby_libdir}/%{ruby_release}/tkextlib
+%{ruby_libdir}/%{ruby_release}/unicode_normalize
 %{ruby_libdir}/%{ruby_release}/uri
 %{ruby_libdir}/%{ruby_release}/webrick
-%{ruby_libdir}/%{ruby_release}/xmlrpc
 %{ruby_libdir}/%{ruby_release}/yaml
 
 # Platform specific libraries.
 %{_libdir}/libruby.so.*
 %dir %{ruby_libarchdir}
 %dir %{ruby_libarchdir}/%{ruby_release}
+%dir %{ruby_libarchdir}/%{ruby_release}/cgi
+%{ruby_libarchdir}/%{ruby_release}/cgi/escape.so
 %{ruby_libarchdir}/%{ruby_release}/continuation.so
 %{ruby_libarchdir}/%{ruby_release}/coverage.so
 %{ruby_libarchdir}/%{ruby_release}/date_core.so
@@ -836,7 +834,12 @@ fi
 %{ruby_libarchdir}/%{ruby_release}/enc/utf_16le.so
 %{ruby_libarchdir}/%{ruby_release}/enc/utf_32be.so
 %{ruby_libarchdir}/%{ruby_release}/enc/utf_32le.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1250.so
 %{ruby_libarchdir}/%{ruby_release}/enc/windows_1251.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1252.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1253.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1254.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1257.so
 %{ruby_libarchdir}/%{ruby_release}/enc/windows_31j.so
 %{ruby_libarchdir}/%{ruby_release}/etc.so
 %{ruby_libarchdir}/%{ruby_release}/fcntl.so
@@ -866,9 +869,6 @@ fi
 %{ruby_libarchdir}/%{ruby_release}/stringio.so
 %{ruby_libarchdir}/%{ruby_release}/strscan.so
 %{ruby_libarchdir}/%{ruby_release}/syslog.so
-%exclude %{ruby_libarchdir}/%{ruby_release}/tcltklib.so
-%{ruby_libarchdir}/%{ruby_release}/thread.so
-%exclude %{ruby_libarchdir}/%{ruby_release}/tkutil.so
 %{ruby_libarchdir}/%{ruby_release}/zlib.so
 
 %files rubygems
@@ -965,14 +965,9 @@ fi
 %{gem_dir}/%{ruby_release}/gems/test-unit-%{test_unit_version}
 %{gem_dir}/%{ruby_release}/specifications/test-unit-%{test_unit_version}.gemspec
 
-%files tcltk
-%{ruby_libdir}/%{ruby_release}/*-tk.rb
-%{ruby_libdir}/%{ruby_release}/tcltk.rb
-%{ruby_libdir}/%{ruby_release}/tk*.rb
-%{ruby_libarchdir}/%{ruby_release}/tcltklib.so
-%{ruby_libarchdir}/%{ruby_release}/tkutil.so
-%{ruby_libdir}/%{ruby_release}/tk
-%{ruby_libdir}/%{ruby_release}/tkextlib
+%files -n rubygem-xmlrpc
+%{gem_dir}/%{ruby_release}/gems/xmlrpc-%{xmlrpc_version}
+%{gem_dir}/%{ruby_release}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
 
 %if %{with emacsen}
 %files mode
@@ -984,6 +979,13 @@ fi
 %endif
 
 %changelog
+* Mon Apr 03 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.1-14
+- update to 2.4.1
+
+* Sat Mar 18 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.0-13
+- update to 2.4.0
+- remove tcltk which was dropped from stdlib.
+
 * Sun Mar 20 2016 Daisuke SUZUKI <daisuke@vinelinux.org> 2.2.4-12
 - rebuild with openssl-1.0.2
 
@@ -1214,7 +1216,7 @@ fi
 - added ruby-1.8.5-float_hash.patch:
   - improve hash collision of Float objects.  [ruby-dev:29352]
 - added ruby-1.8.5-time_vardecl.patch:
-  - time.c (time_to_s): variable declaration after an execution statement.
+  - time.c (time_to_s): variable declaration after an execution sattement.
 - added ruby-1.8.5-bignum.patch:
   - numeric.c (fix_plus): addition in Fixnum will never overflow long.  a
     patch from Ondrej Bilka <neleai at seznam.cz>.  [ruby-core:08794]