From 8d6878b496c361684a107d848d8c92540fdfd574 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Tue, 1 Aug 2023 14:17:24 +0800 Subject: [PATCH] Fix build error for Ruby 3.2 --- ...ion-warning-about-being-called-on-TrueClass.patch | 12 ++++++++++++ rubygem-websocket-extensions.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Fix-deprecation-warning-about-being-called-on-TrueClass.patch diff --git a/Fix-deprecation-warning-about-being-called-on-TrueClass.patch b/Fix-deprecation-warning-about-being-called-on-TrueClass.patch new file mode 100644 index 0000000..477775e --- /dev/null +++ b/Fix-deprecation-warning-about-being-called-on-TrueClass.patch @@ -0,0 +1,12 @@ +diff -Nur a/lib/websocket/extensions/parser.rb b/lib/websocket/extensions/parser.rb +--- a/lib/websocket/extensions/parser.rb 2023-08-01 10:59:55.411703622 +0800 ++++ b/lib/websocket/extensions/parser.rb 2023-08-01 10:59:46.940697645 +0800 +@@ -38,7 +38,7 @@ + else + data = true + end +- if data =~ NUMBER ++ if data != true and data =~ NUMBER + data = data =~ /\./ ? data.to_f : data.to_i(10) + end + diff --git a/rubygem-websocket-extensions.spec b/rubygem-websocket-extensions.spec index 95400c3..e50ea7f 100644 --- a/rubygem-websocket-extensions.spec +++ b/rubygem-websocket-extensions.spec @@ -1,7 +1,7 @@ %global gem_name websocket-extensions Name: rubygem-%{gem_name} Version: 0.1.2 -Release: 3 +Release: 4 Summary: Generic extension manager for WebSocket connections License: MIT URL: http://github.com/faye/websocket-extensions-ruby @@ -9,6 +9,7 @@ Source0: https://rubygems.org/gems/websocket-extensions-%{version}.g Source1: https://github.com/faye/websocket-extensions-ruby/archive/%{version}.tar.gz Patch0: CVE-2020-7663.patch Patch1: As-of-rspec-mocks-v3.10.3-mock-expectations-need-to-use.patch +patch2: Fix-deprecation-warning-about-being-called-on-TrueClass.patch BuildRequires: ruby(release) rubygems-devel ruby rubygem(rspec) BuildArch: noarch %description @@ -26,6 +27,7 @@ gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch0 -p1 +%patch2 -p1 %build gem build %{gem_name}.gemspec @@ -41,6 +43,7 @@ pushd .%{gem_instdir} tar -xzf %{SOURCE1} cd %{gem_name}-ruby-%{version} cat %{PATCH1} | patch -p1 +cat %{PATCH2} | patch -p1 rspec spec popd @@ -57,6 +60,9 @@ popd %doc %{gem_instdir}/README.md %changelog +* Tue Aug 1 2023 liyanan - 0.1.2-4 +- Fix build error for Ruby 3.2 + * Tue Jan 17 2023 yaoxin - 0.1.2-3 - Fix build failed due to ruby update to 3.1.3