From 2fa5bddf120f905c2e550e438f189fe46e594a26 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Dec 09 2014 08:46:51 +0000 Subject: Upgrade to Ruby 2.2.0 (r48741). --- diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index e515ba0..02fa59f 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -39,7 +39,7 @@ index 17ed3ed..5843651 100644 + unset ruby_version_suffix + AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1) else - RUBY_LIB_VERSION="\"${ruby_version}\"" + RUBY_LIB_VERSION="${ruby_version}" fi AC_SUBST(RUBY_LIB_VERSION_STYLE) AC_SUBST(RUBY_LIB_VERSION) diff --git a/ruby.spec b/ruby.spec index b0bcf0e..e5ac0b2 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,10 +7,10 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -%global milestone preview2 +#%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -#%%global revision 48629 +%global revision 48741 %global ruby_archive %{name}-%{ruby_version} @@ -39,9 +39,9 @@ %global json_version 1.8.1 %global minitest_version 5.4.3 %global power_assert_version 0.2.2 -%global psych_version 2.0.6 -%global rake_version 10.4.0 -%global rdoc_version 4.2.0.alpha +%global psych_version 2.0.8 +%global rake_version 10.4.2 +%global rdoc_version 4.2.0 %global test_unit_version 3.0.7 # Might not be needed in the future, if we are lucky enough. @@ -884,8 +884,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.preview2 -- Upgrade to Ruby 2.2.0-preview2. +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48741 +- Upgrade to Ruby 2.2.0 (r48741). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages.