From c155669e8940dd39c3b09683421607bedf90f40a684a351a7a0a34d7f89f9b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 28 Feb 2014 11:02:26 +0000 Subject: [PATCH 1/2] - Update to 2.1.1 Speedup and bugfixes (upstream bug ids): - rubygems 2.2.2 (#9489) - fix segfault at unpacking modified String (#9478) - Struct#send(:setter=, rhs) does not return rhs (#9470) - Array#uniq behavior change (#9470) - Timeout behavior change (#9470) - Hash lookup with #hash and #eql broken (#9470) - bigdecimal division issue (#9470) - SizedQueue not working (#9470) - BidDecimal division (#9316) - fix 'gem install --ignore-dependencies' for remote gems (#9282) - Array#to_h should not ignore badly formed elements (#9270) - Method#arity for keyword arguments (#8072) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=78 --- ruby-2.1.0.tar.bz2 | 3 --- ruby-2.1.1.tar.bz2 | 3 +++ ruby.changes | 18 ++++++++++++++++++ ruby.spec | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 ruby-2.1.0.tar.bz2 create mode 100644 ruby-2.1.1.tar.bz2 diff --git a/ruby-2.1.0.tar.bz2 b/ruby-2.1.0.tar.bz2 deleted file mode 100644 index 8d19731..0000000 --- a/ruby-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d3f4ad5f619ec15229206b6667586dcec7cc986672c8fbb8558161ecf07e277 -size 12007442 diff --git a/ruby-2.1.1.tar.bz2 b/ruby-2.1.1.tar.bz2 new file mode 100644 index 0000000..bacd5c1 --- /dev/null +++ b/ruby-2.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96aabab4dd4a2e57dd0d28052650e6fcdc8f133fa8980d9b936814b1e93f6cfc +size 11990697 diff --git a/ruby.changes b/ruby.changes index 501bc24..74baa16 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Feb 28 09:03:07 UTC 2014 - kkaempf@suse.com + +- Update to 2.1.1 + Speedup and bugfixes (upstream bug ids): + - rubygems 2.2.2 (#9489) + - fix segfault at unpacking modified String (#9478) + - Struct#send(:setter=, rhs) does not return rhs (#9470) + - Array#uniq behavior change (#9470) + - Timeout behavior change (#9470) + - Hash lookup with #hash and #eql broken (#9470) + - bigdecimal division issue (#9470) + - SizedQueue not working (#9470) + - BidDecimal division (#9316) + - fix 'gem install --ignore-dependencies' for remote gems (#9282) + - Array#to_h should not ignore badly formed elements (#9270) + - Method#arity for keyword arguments (#8072) + ------------------------------------------------------------------- Sat Feb 15 21:05:19 UTC 2014 - kkaempf@suse.com diff --git a/ruby.spec b/ruby.spec index 9a1aaed..28d773d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -25,14 +25,14 @@ Name: ruby #### %define patch_level p0 -Version: 2.1.0 +Version: 2.1.1 Release: 0 # ruby-macros and ruby-common version %define rpm_macros_version 3 # -%define pkg_version 2.1.0 +%define pkg_version %{version} %define libname lib%{name}2_1 # keep in sync with macro file! %define rb_ver 2.1.0 From 741642da4ab310d2081dda3154a5516bbb5a9d963bd43090f5b134c9bc8397a7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 28 Feb 2014 20:24:41 +0000 Subject: [PATCH 2/2] Accepting request 224240 from OBS:Server:Unstable fix dependency errors by using api version 2.1.0 for minitest and friends OBS-URL: https://build.opensuse.org/request/show/224240 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=79 --- ruby.changes | 5 +++++ ruby.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ruby.changes b/ruby.changes index 74baa16..b817120 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 28 14:14:00 UTC 2014 - adrian@suse.de + +- use api version 2.1.0 again to avoid dependency breakages + ------------------------------------------------------------------- Fri Feb 28 09:03:07 UTC 2014 - kkaempf@suse.com diff --git a/ruby.spec b/ruby.spec index 28d773d..4ab2f98 100644 --- a/ruby.spec +++ b/ruby.spec @@ -168,8 +168,8 @@ Group: Development/Languages/Ruby # - the usual means to generate provides for rubygems is using ruby # and ruby is not available while building ruby :-/ -%define gen_embedded_provides4() %(awk -f %{S:8} -- %version %arch %1 %2 %3 %4) -%define gen_embedded_provides5() %(awk -f %{S:8} -- %version %arch %1 %2 %3 %4 %5) +%define gen_embedded_provides4() %(awk -f %{S:8} -- 2.1.0 %arch %1 %2 %3 %4) +%define gen_embedded_provides5() %(awk -f %{S:8} -- 2.1.0 %arch %1 %2 %3 %4 %5) %gen_embedded_provides4 io-console 0 4 2 %gen_embedded_provides4 json 1 8 1 %gen_embedded_provides4 minitest 4 7 5