ruby: update to 2.1.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8600 ec354946-7b23-47d6-9f5a-488ba84defc7

r/ruby/ruby-vl.spec

@@ -1,16 +1,16 @@
 %global major_version 2
-%global minor_version 0
-%global teeny_version 0
-%global patch_level 481
+%global minor_version 1
+%global teeny_version 2
+#global patch_level 481
 
 %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}.%{patch_level}
+%global ruby_version_patch_level %{major_minor_version}.%{teeny_version}
 %global ruby_release %{ruby_version}
-%global ruby_abi %{ruby_version}
+%global ruby_abi %{major_minor_version}.0
 
-%global ruby_archive %{name}-%{ruby_version}-p%{patch_level}
+%global ruby_archive %{name}-%{ruby_version}
 
 %global ruby_libdir %{_datadir}/%{name}/%{ruby_release}
 %global ruby_libarchdir %{_libdir}/%{name}/%{ruby_release}
@@ -28,7 +28,7 @@
 %global ruby_vendorlibdir %{_prefix}/share/ruby/%{ruby_vendordir}/%{ruby_release}
 %global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}/%{ruby_release}
 
-%global rubygems_version 2.0.3
+%global rubygems_version 2.2.2
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
@@ -39,23 +39,24 @@
 %global gem_extdir %{_libdir}/gems
 %global gem_extdirs %{_exec_prefix}/lib{,64}/gems
 
-%global rake_version 0.9.6
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
 # http://redmine.ruby-lang.org/issues/5313
-%global irb_version %{ruby_version_patch_level}
-%global rdoc_version 4.0.0
-%global bigdecimal_version 1.2.0
+%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 json_version 1.7.7
-%global minitest_version 4.3.2
-%global psych_version 2.0.0
+%global json_version 1.8.1
+%global minitest_version 4.7.5
+%global psych_version 2.0.5
 
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # change.
-%global ruby_rel 4
+%global ruby_rel 5
 
 %bcond_without emacsen
 %define rbmode          ruby-mode
@@ -66,7 +67,7 @@
 Summary: An interpreter of object-oriented scripting language
 Summary(ja): オブジェクト指向言語 Ruby インタプリタ
 Name: ruby
-Version: %{ruby_version_patch_level}
+Version: %{ruby_version}
 Release: %{ruby_rel}%{?_dist_release}
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
@@ -85,45 +86,26 @@ Source10: Changelog.fedora
 
 ### Patch[0-99] from fedora package
 # http://bugs.ruby-lang.org/issues/7807
-Patch0: ruby-2.0.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+Patch0: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+# Allows to override libruby.so placement. Hopefully we will be able to return
+# to plain --with-rubyarchprefix.
+# http://bugs.ruby-lang.org/issues/8973
+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-1.9.3-always-use-i386.patch
+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.0.0-custom-rubygems-location.patch
-# Add support for installing binary extensions according to FHS.
-# https://github.com/rubygems/rubygems/issues/210
-# Note that 8th patch might be resolved by
-# https://bugs.ruby-lang.org/issues/7897
-Patch9: rubygems-2.0.0-binary-extensions.patch
+Patch8: ruby-2.1.0-custom-rubygems-location.patch
 # Make mkmf verbose by default
 Patch12: ruby-1.9.3-mkmf-verbose.patch
-# This slightly changes behavior of "gem install --install-dir" behavior.
-# Without this patch, Specifications.dirs is modified and gems installed on
-# the system cannot be required anymore. This causes later issues when RDoc
-# documentation should be generated, since json gem is sudenly not accessible.
-# https://github.com/rubygems/rubygems/pull/452
-Patch13: rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
-# This prevents issues, when ruby configuration specifies --with-ruby-version=''.
-# https://github.com/rubygems/rubygems/pull/455
-Patch14: rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
-# Adds aarch64 support.
-# http://bugs.ruby-lang.org/issues/8331
-# https://bugzilla.redhat.com/show_bug.cgi?id=926463
-# Please note that this is the BZ patch, it might be good idea to update it
-# with its upstream version when available.
-Patch16: ruby-2.0.0-p195-aarch64.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.0-Allow-to-specify-additional-preludes-by-configuratio.patch
-# Fixes issues with DESTDIR.
-# https://bugs.ruby-lang.org/issues/8115
-Patch18: ruby-2.0.0-p247-Revert-mkmf.rb-prefix-install_dirs-only-with-DESTDIR.patch
+Patch17: ruby-2.1.2-Allow-to-specify-additional-preludes-by-configuratio.patch
 
 
 
@@ -270,7 +252,7 @@ Summary:    The Interactive Ruby
 Summary(ja):  インタラクティブ Ruby
 Version:    %{irb_version}
 Group:      Development/Libraries
-Requires:   %{name}-libs = %{ruby_version_patch_level}
+Requires:   %{name}-libs = %{ruby_version}
 Obsoletes:  irb < 1.9
 Provides:   irb = %{version}-%{release}
 Provides:   ruby(irb) = %{version}-%{release}
@@ -424,8 +406,8 @@ format.
 Summary:    Tcl/Tk interface for scripting language Ruby
 Summary(ja): RubyのTcl/Tkインタフェースライブラリ
 Group:      Development/Languages
-Requires:   %{name}-libs = %{ruby_version_patch_level}
-Provides:   ruby(tcltk) = %{ruby_version_patch_level}-%{release}
+Requires:   %{name}-libs = %{ruby_version}
+Provides:   ruby(tcltk) = %{ruby_version}-%{release}
 
 %description tcltk
 Tcl/Tk interface for the object-oriented scripting language Ruby.
@@ -455,16 +437,12 @@ Emacs上でRubyスクリプトを書くのに便利なモードです．
 %setup -q -n %{ruby_archive}
 
 %patch0 -p1
+%patch1 -p1
 %patch3 -p1
 %patch5 -p1
 %patch8 -p1
-%patch9 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch16 -p1
 %patch17 -p1
-%patch18 -p1
 
 cp -a %{SOURCE3} .
 
@@ -475,6 +453,7 @@ autoconf
         --with-rubylibprefix='%{ruby_libdir}' \
         --with-rubyarchprefix='%{ruby_libarchdir}' \
         --with-archdir='%{ruby_libarchdir}' \
+        --with-archlibdir='%{_libdir}' \
         --with-sitedir='%{ruby_sitelibdir}' \
         --with-sitearchdir='%{ruby_sitearchdir}' \
         --with-vendordir='%{ruby_vendorlibdir}' \
@@ -774,7 +753,6 @@ fi
 %dir %{ruby_libarchdir}
 %{ruby_libarchdir}/continuation.so
 %{ruby_libarchdir}/coverage.so
-%{ruby_libarchdir}/curses.so
 %{ruby_libarchdir}/date_core.so
 %{ruby_libarchdir}/dbm.so
 %dir %{ruby_libarchdir}/digest
@@ -862,6 +840,7 @@ fi
 %dir %{ruby_libarchdir}/racc
 %{ruby_libarchdir}/racc/cparse.so
 %{ruby_libarchdir}/rbconfig.rb
+%{ruby_libarchdir}/rbconfig/sizeof.so
 %{ruby_libarchdir}/readline.so
 %{ruby_libarchdir}/ripper.so
 %{ruby_libarchdir}/sdbm.so
@@ -870,6 +849,7 @@ fi
 %{ruby_libarchdir}/strscan.so
 %{ruby_libarchdir}/syslog.so
 %exclude %{ruby_libarchdir}/tcltklib.so
+%{ruby_libarchdir}/thread.so
 %exclude %{ruby_libarchdir}/tkutil.so
 %{ruby_libarchdir}/zlib.so
 
@@ -976,6 +956,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.2-1
+- update to 2.1.2
+
 * Wed May 21 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.0.481-4
 - update to 2.0.0-p452