From 05eb8b6a78d323e98f80dfd0c06bf80d03d9a2b1 Mon Sep 17 00:00:00 2001 From: Josef Stribny Date: Tue, 14 Apr 2015 09:51:46 +0200 Subject: [PATCH] Update to Ruby 2.2.2 --- .gitignore | 1 + ruby-2.2.1-use-statfs.patch | 25 ++++--------------------- ruby.spec | 7 +++++-- sources | 2 +- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index c9945dc..4b77c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ruby-2.*.tar.bz2 /ruby-2.2.0.tar.xz /ruby-2.2.1.tar.xz +/ruby-2.2.2.tar.xz diff --git a/ruby-2.2.1-use-statfs.patch b/ruby-2.2.1-use-statfs.patch index 842eb0e..168e5d7 100644 --- a/ruby-2.2.1-use-statfs.patch +++ b/ruby-2.2.1-use-statfs.patch @@ -1,31 +1,14 @@ -From acae106c7c8feab92a52982976b147f1100207a5 Mon Sep 17 00:00:00 2001 -From: nobu -Date: Tue, 24 Mar 2015 08:30:15 +0000 -Subject: [PATCH] fs.c: use statfs/statvfs - -* ext/-test-/file/fs.c (get_fsname): return filesystem name by - statfs/statvfs. [ruby-core:68624] [Bug #10998] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ---- - ChangeLog | 5 +++ - ext/-test-/file/extconf.rb | 14 ++++++++ - ext/-test-/file/fs.c | 85 +++++++++++++++++++++++++--------------------- - 3 files changed, 66 insertions(+), 38 deletions(-) - diff --git a/ChangeLog b/ChangeLog -index a2f2f97..d7e11af 100644 +index 909c092..9f09144 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,8 @@ +@@ -70,1 +70,6 @@ +Tue Mar 24 17:30:12 2015 Nobuyoshi Nakada + -+ * ext/-test-/file/fs.c (get_fsname): return filesystem name by -+ statfs/statvfs. [ruby-core:68624] [Bug #10998] ++ * ext/-test-/file/fs.c (get_fsname): return filesystem name by ++ statfs/statvfs. [ruby-core:68624] [Bug #10998] + Thu Feb 26 15:48:41 2015 NAKAMURA Usaku - - * ext/win32/Win32API.rb (initialize): accept both a string and an array diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb index 4e134dd..be4a2fb 100644 --- a/ext/-test-/file/extconf.rb diff --git a/ruby.spec b/ruby.spec index b72f53d..275b7e8 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 2 %global minor_version 2 -%global teeny_version 1 +%global teeny_version 2 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -21,7 +21,7 @@ %endif -%global release 10 +%global release 1 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %global rubygems_version 2.4.5 @@ -895,6 +895,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Tue Apr 14 2015 Josef Stribny - 2.2.2-1 +- Update to Ruby 2.2.2 + * Fri Mar 20 2015 Vít Ondruch - 2.2.1-10 - Fix libruby.so versions in SystemTap scripts (rhbz#1202232). diff --git a/sources b/sources index c9ad145..d24389c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7570579539faaa734c02e2857370298 ruby-2.2.1.tar.xz +dbce9b9d79d90f213ba8d448b0b6ed86 ruby-2.2.2.tar.xz