diff --git a/_service b/_service index 48caf48..ab0b071 100644 --- a/_service +++ b/_service @@ -1,11 +1,9 @@ - ruby-3.2.0-rc1/yjit - + ruby-3.2.0/yjit + false - ruby-3.2.0-rc1/yjit + ruby-3.2.0/yjit diff --git a/ruby-3.1.3-remove-timezone-test.patch b/ruby-3.1.3-remove-timezone-test.patch deleted file mode 100644 index f6a1033..0000000 --- a/ruby-3.1.3-remove-timezone-test.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit d35008d3d5438de8e1f78c40e5c672ee9983f29a -Author: Stephan Kulow -Date: Tue Dec 6 12:35:26 2022 +0100 - - Remove timezone test case relying on the exact timezone data - - The exact hour of the DST switch for Singapore changed between 2022f and - 2022g updates of the timezone database. - - See https://bugs.ruby-lang.org/issues/19187 and - http://mm.icann.org/pipermail/tz-announce/2022-November/000076.html - -diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb -index 6fdb95bafe..2b0ec9c8a4 100644 ---- a/test/ruby/test_time_tz.rb -+++ b/test/ruby/test_time_tz.rb -@@ -138,15 +138,6 @@ def test_america_managua - } - end - -- def test_asia_singapore -- with_tz(tz="Asia/Singapore") { -- assert_time_constructor(tz, "1981-12-31 23:59:59 +0730", :local, [1981,12,31,23,59,59]) -- assert_time_constructor(tz, "1982-01-01 00:30:00 +0800", :local, [1982,1,1,0,0,0]) -- assert_time_constructor(tz, "1982-01-01 00:59:59 +0800", :local, [1982,1,1,0,29,59]) -- assert_time_constructor(tz, "1982-01-01 00:30:00 +0800", :local, [1982,1,1,0,30,0]) -- } -- end -- - def test_asia_tokyo - with_tz(tz="Asia/Tokyo") { - h = CORRECT_TOKYO_DST_1951 ? 0 : 2 -@@ -450,7 +441,6 @@ def self.gen_zdump_test(data) - America/Managua Wed Jan 1 04:59:59 1997 UTC = Tue Dec 31 23:59:59 1996 EST isdst=0 gmtoff=-18000 - America/Managua Wed Jan 1 05:00:00 1997 UTC = Tue Dec 31 23:00:00 1996 CST isdst=0 gmtoff=-21600 - Asia/Singapore Sun Aug 8 16:30:00 1965 UTC = Mon Aug 9 00:00:00 1965 SGT isdst=0 gmtoff=27000 --Asia/Singapore Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000 - Asia/Singapore Thu Dec 31 16:30:00 1981 UTC = Fri Jan 1 00:30:00 1982 SGT isdst=0 gmtoff=28800 - End - gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End' diff --git a/ruby-3.2.0-rc1.tar.xz b/ruby-3.2.0-rc1.tar.xz deleted file mode 100644 index ff4c053..0000000 --- a/ruby-3.2.0-rc1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc -size 14934012 diff --git a/ruby-3.2.0.tar.xz b/ruby-3.2.0.tar.xz new file mode 100644 index 0000000..087e296 --- /dev/null +++ b/ruby-3.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +size 15058364 diff --git a/ruby3.2.changes b/ruby3.2.changes index e1426f3..5288bbf 100644 --- a/ruby3.2.changes +++ b/ruby3.2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 25 09:19:30 UTC 2022 - Marcus Rueckert + +- Update to 3.2.0 + https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ +- Drop ruby-3.1.3-remove-timezone-test.patch: + Fix included in update +- Refreshed use-pie.patch + ------------------------------------------------------------------- Thu Dec 22 10:20:24 UTC 2022 - Marcus Rueckert diff --git a/ruby3.2.spec b/ruby3.2.spec index 686058e..f77fc3d 100644 --- a/ruby3.2.spec +++ b/ruby3.2.spec @@ -35,11 +35,11 @@ %global patch_level p0 Name: ruby3.2%{psuffix} -Version: 3.2.0~rc1 +Version: 3.2.0 Release: 0 -%global pkg_version 3.2.0-rc1 +%global pkg_version 3.2.0 # make the exported API version explicit -%global api_version 3.2.0+3 +%global api_version 3.2.0 %global rb_binary_suffix .ruby3.2 %global rb_soname ruby3.2 %global _rb_ua_weight 32 @@ -97,7 +97,6 @@ Source6: cargo_config Source98: series Source99: %{rb_soname}-rpmlintrc Patch: use-pie.patch -Patch1: ruby-3.1.3-remove-timezone-test.patch BuildRequires: ruby-bundled-gems-rpmhelper %if %{with clang} BuildRequires: clang @@ -479,7 +478,6 @@ make test test-tool test-all V=1 TESTOPTS="%{?_smp_mflags} -q --tty=no $DISABLE_ %files stdlib %endif %{_libdir}/ruby/ -%exclude %{_libdir}/ruby/gems/%{api_version}/gems/*/test/ %dir %{rb_extdir} %dir %{rb_extarchdir} %dir %{rb_extversionedarchdir} diff --git a/use-pie.patch b/use-pie.patch index 89d8623..2240d86 100644 --- a/use-pie.patch +++ b/use-pie.patch @@ -1,8 +1,8 @@ -Index: ruby-3.2.0-preview3/template/Makefile.in +Index: ruby-3.2.0/template/Makefile.in =================================================================== ---- ruby-3.2.0-preview3.orig/template/Makefile.in -+++ ruby-3.2.0-preview3/template/Makefile.in -@@ -299,7 +299,7 @@ miniruby$(EXEEXT): +--- ruby-3.2.0.orig/template/Makefile.in ++++ ruby-3.2.0/template/Makefile.in +@@ -302,7 +302,7 @@ miniruby$(EXEEXT): $(PROGRAM): @$(RM) $@ $(ECHO) linking $@ diff --git a/vendor.tar.xz b/vendor.tar.xz index 80ae601..c5d10b3 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57841d0dd7ec860657510a888dbda768a3f550cb0efbae1f8e0e3459b998e6ce -size 3321920 +oid sha256:cbbafc0c4cbdeae3bceebc991d184400ad59f5e61caa68e2298a6cc58f8f6d56 +size 3308696