diff --git a/ruby-3.4.2-Bug-21024-cstdbool-header-has-been-useless.patch b/ruby-3.4.2-Bug-21024-cstdbool-header-has-been-useless.patch deleted file mode 100644 index 49837ac..0000000 --- a/ruby-3.4.2-Bug-21024-cstdbool-header-has-been-useless.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57a10fcde1e52ad2282da01c457311d6f190ccfe Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Tue, 14 Jan 2025 19:11:33 +0900 -Subject: [PATCH] [Bug #21024] header has been useless - -And finally deprecated at C++-17. -Patched by jprokop (Jarek Prokop). ---- - include/ruby/internal/stdbool.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/include/ruby/internal/stdbool.h b/include/ruby/internal/stdbool.h -index 1ca61136ba..7f3e6dcf97 100644 ---- a/include/ruby/internal/stdbool.h -+++ b/include/ruby/internal/stdbool.h -@@ -27,10 +27,6 @@ - - #elif defined(__cplusplus) - # /* bool is a keyword in C++. */ --# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L) --# include --# endif --# - # ifndef __bool_true_false_are_defined - # define __bool_true_false_are_defined - # endif diff --git a/ruby.spec b/ruby.spec index 4396a7f..a9d940b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 4 -%global teeny_version 1 +%global teeny_version 2 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -121,9 +121,9 @@ %global drb_version 2.2.1 %global getoptlong_version 0.2.1 %global net_ftp_version 0.3.8 -%global net_imap_version 0.5.4 +%global net_imap_version 0.5.6 %global net_pop_version 0.1.2 -%global net_smtp_version 0.5.0 +%global net_smtp_version 0.5.1 %global nkf_version 0.2.0 %global matrix_version 0.4.2 %global minitest_version 5.25.4 @@ -278,12 +278,6 @@ Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch # Disable syntax_suggest test suite, which tries to download its dependencies. # https://bugs.ruby-lang.org/issues/19297 Patch9: ruby-3.3.0-Disable-syntax-suggest-test-case.patch -# Don't include header in C++ environment. -# https://bugs.ruby-lang.org/issues/21024 -# https://github.com/ruby/ruby/pull/12628 -# See discussion on Ruby 3.5 PR -# https://github.com/ruby/ruby/pull/12551#discussion_r1913285350 -Patch10: ruby-3.4.2-Bug-21024-cstdbool-header-has-been-useless.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?with_rubypick:Suggests: rubypick} @@ -776,7 +770,6 @@ analysis result in RBS format, a standard type description format for Ruby %patch 4 -p1 %patch 6 -p1 %patch 9 -p1 -%patch 10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1882,7 +1875,11 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Sat Feb 01 2025 Björn Esser +* Wed Feb 19 2025 Vít Ondruch - 3.4.2-23 +- Upgrade to Ruby 3.4.2. + Resolves: rhbz#2345875 + +* Sat Feb 01 2025 Björn Esser - 3.4.1-23 - Add explicit BR: libxcrypt-devel * Fri Jan 24 2025 Jarek Prokop - 3.4.1-22 diff --git a/sources b/sources index 504f64b..0fa9f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.4.1.tar.xz) = 8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680 +SHA512 (ruby-3.4.2.tar.xz) = cb8b5023bce316393716548c5f0a44c7d0240724ff79b995517641266af30bedc6f402c1c8fa27368ea607e2aa6d36bbb201e00c6e9dd2a80d837431d32343b5