Browse Source

ruby: update to 2.2.3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9742 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 8 years ago
parent
commit
4883c42173
1 changed files with 64 additions and 36 deletions
  1. 64 36
      r/ruby/ruby-vl.spec

+ 64 - 36
r/ruby/ruby-vl.spec

@@ -1,12 +1,10 @@
 %global major_version 2
-%global minor_version 1
-%global teeny_version 5
-#global patch_level 95
+%global minor_version 2
+%global teeny_version 3
 
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
-%global ruby_version_patch_level %{major_minor_version}.%{teeny_version}
 %global ruby_release %{major_minor_version}.0
 %global ruby_abi %{major_minor_version}.0
 
@@ -26,7 +24,7 @@
 %global ruby_vendorlibdir %{_prefix}/share/ruby/%{ruby_vendordir}
 %global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}
 
-%global rubygems_version 2.2.2
+%global rubygems_version 2.4.5
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
@@ -41,13 +39,15 @@
 # http://redmine.ruby-lang.org/issues/5313
 %global irb_version %{ruby_version}
 
-%global rake_version 10.1.0
-%global rdoc_version 4.1.0
-%global bigdecimal_version 1.2.4
-%global io_console_version 0.4.2
+%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 4.7.5
-%global psych_version 2.0.5
+%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
 
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
@@ -55,7 +55,7 @@
 # is updated - because it may be that the versions of sub-components don't
 # change.
 # rubyのmainバージョンが更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 9
+%global ruby_rel 10
 
 %bcond_without emacsen
 %define rbmode          ruby-mode
@@ -93,9 +93,6 @@ Patch1: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
 # Force multiarch directories for i.86 to be always named i386. This solves
 # some differencies in build between Fedora and RHEL.
 Patch3: ruby-2.1.0-always-use-i386.patch
-# Fixes random WEBRick test failures.
-# https://bugs.ruby-lang.org/issues/6573.
-Patch5: ruby-1.9.3.p195-fix-webrick-tests.patch
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
 # http://redmine.ruby-lang.org/issues/5617
 Patch8: ruby-2.1.0-custom-rubygems-location.patch
@@ -104,7 +101,7 @@ Patch12: ruby-1.9.3-mkmf-verbose.patch
 # Adds support for '--with-prelude' configuration option. This allows to built
 # in support for ABRT.
 # http://bugs.ruby-lang.org/issues/8566
-Patch17: ruby-2.1.2-Allow-to-specify-additional-preludes-by-configuratio.patch
+Patch17: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
 
 
 
@@ -126,7 +123,8 @@ BuildRequires: libffi-devel
 BuildRequires: openssl-devel
 BuildRequires: libyaml-devel
 BuildRequires: readline-devel
-BuildRequires: tcl tk
+BuildRequires: tcl-devel
+BuildRequires: tk-devel
 BuildRequires: libX11-devel
 BuildRequires: zlib-devel
 # Needed to pass test_set_program_name(TestRubyOptions)
@@ -396,10 +394,42 @@ Provides:   rubygem(psych) = %{version}-%{release}
 %description -n rubygem-psych
 Psych is a YAML parser and emitter. Psych leverages
 libyaml[http://pyyaml.org/wiki/LibYAML] for its YAML parsing and
-emitting
-capabilities. In addition to wrapping libyaml, Psych also knows how to
-serialize and de-serialize most Ruby objects to and from the YAML
-format.
+emitting capabilities. In addition to wrapping libyaml, Psych also 
+knows how to serialize and de-serialize most Ruby objects to and 
+from the YAML format.
+
+
+%package -n rubygem-power_assert
+Summary:    Power Assert for Ruby
+Version:    %{power_assert_version}
+Group:      Development/Libraries
+License:    Ruby or BSD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(power_assert) = %{version}-%{release}
+BuildArch:  noarch
+
+%description -n rubygem-power_assert
+Power Assert for Ruby.
+
+
+%package -n rubygem-test-unit
+Summary:    Improved version of Test::Unit bundled in Ruby 1.8.x
+Version:    %{test_unit_version}
+Group:      Development/Libraries
+# lib/test/unit/diff.rb is a double license of the Ruby license and PSF license.
+# lib/test-unit.rb is a dual license of the Ruby license and LGPLv2.1 or later.
+License:    (Ruby or BSD) and (Ruby or BSD or Python) and (Ruby or BSD or LGPLv2+)
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Requires:   rubygem(power_assert)
+Provides:   rubygem(test-unit) = %{version}-%{release}
+BuildArch:  noarch
+
+%description -n rubygem-test-unit
+Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
+bundled in Ruby 1.8.x had not been improved but unbundled
+Test::Unit (test-unit) is improved actively.
 
 
 %package tcltk
@@ -439,7 +469,6 @@ Emacs上でRubyスクリプトを書くのに便利なモードです.
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch5 -p1
 %patch8 -p1
 %patch12 -p1
 %patch17 -p1
@@ -582,12 +611,6 @@ mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json/ %{buildroot}%{gem_extdir
 ln -s %{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/json %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json
 mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
-## minitest
-mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib
-mv %{buildroot}%{ruby_libdir}/%{ruby_release}/minitest %{buildroot}%{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib
-mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/minitest-%{minitest_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
-ln -s %{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib/minitest %{buildroot}%{ruby_libdir}/%{ruby_release}/minitest
-
 ## psych
 mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}/lib
 mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/psych-%{psych_version}/lib
@@ -678,7 +701,6 @@ fi
 %doc LEGAL
 %{_bindir}/erb
 %{_bindir}/ruby
-%{_bindir}/testrb
 %{_mandir}/man1/erb*
 %{_mandir}/man1/ruby*
 
@@ -722,9 +744,7 @@ fi
 %exclude %{ruby_libdir}/%{ruby_release}/tcltk.rb
 %exclude %{ruby_libdir}/%{ruby_release}/tk*.rb
 %{ruby_libdir}/%{ruby_release}/cgi
-%{ruby_libdir}/%{ruby_release}/date
 %{ruby_libdir}/%{ruby_release}/digest
-%{ruby_libdir}/%{ruby_release}/dl
 %{ruby_libdir}/%{ruby_release}/drb
 %{ruby_libdir}/%{ruby_release}/fiddle
 %exclude %{ruby_libdir}/%{ruby_release}/irb
@@ -740,7 +760,6 @@ fi
 %{ruby_libdir}/%{ruby_release}/ripper
 %{ruby_libdir}/%{ruby_release}/rss
 %{ruby_libdir}/%{ruby_release}/shell
-%{ruby_libdir}/%{ruby_release}/test
 %{ruby_libdir}/%{ruby_release}/syslog
 %exclude %{ruby_libdir}/%{ruby_release}/tk
 %exclude %{ruby_libdir}/%{ruby_release}/tkextlib
@@ -764,9 +783,6 @@ fi
 %{ruby_libarchdir}/%{ruby_release}/digest/rmd160.so
 %{ruby_libarchdir}/%{ruby_release}/digest/sha1.so
 %{ruby_libarchdir}/%{ruby_release}/digest/sha2.so
-%dir %{ruby_libarchdir}/%{ruby_release}/dl
-%{ruby_libarchdir}/%{ruby_release}/dl.so
-%{ruby_libarchdir}/%{ruby_release}/dl/callback.so
 %dir %{ruby_libarchdir}/%{ruby_release}/enc
 %{ruby_libarchdir}/%{ruby_release}/enc/big5.so
 %{ruby_libarchdir}/%{ruby_release}/enc/cp949.so
@@ -928,7 +944,7 @@ fi
 %{ruby_libarchdir}/%{ruby_release}/json
 
 %files -n rubygem-minitest
-%{ruby_libdir}/%{ruby_release}/minitest
+#%{ruby_libdir}/%{ruby_release}/minitest
 %{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}
 %{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
 
@@ -940,6 +956,15 @@ fi
 %{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}
 %{gem_dir}/%{ruby_release}/specifications/psych-%{psych_version}.gemspec
 
+%files -n rubygem-power_assert
+%{gem_dir}/%{ruby_release}/gems/power_assert-%{power_assert_version}
+%exclude %{gem_dir}/%{ruby_release}/gems/power_assert-%{power_assert_version}/.*
+%{gem_dir}/%{ruby_release}/specifications/power_assert-%{power_assert_version}.gemspec
+
+%files -n rubygem-test-unit
+%{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
@@ -959,6 +984,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan  5 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 2.2.3-10
+- update to 2.2.3
+
 * Wed Nov 19 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.5-9
 - update to 2.1.5