Upgrade to 6.1.4.1

(cherry picked from commit 4c7cb143fb65bdb82650d8f8b9fb9b5923ae5585)

rubygem-actioncable.spec

@@ -1,47 +1,59 @@
 %global gem_name actioncable
-%global recompile_js 1
+%global recompile_js	1
-Name:                rubygem-%{gem_name}
+
-Version:             5.2.4.4
+Name:		rubygem-%{gem_name}
-Release:             1
+Version:	6.1.4.1
-Summary:             WebSocket framework for Rails
+Release:	1
-License:             MIT
+Summary:	WebSocket framework for Rails
-URL:                 http://rubyonrails.org
+License:	MIT
-Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
+URL:		http://rubyonrails.org
-Source1:             https://github.com/rails/rails/archive/v%{version}.tar.gz
+Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Recompile with script extracted from
+Source1: 	%{gem_name}-%{version}-tests.txz
-# https://github.com/rails/rails/blob/71d406697266fc2525706361b86aeb85183fe4c7/actioncable/Rakefile
+Source2: 	%{gem_name}-%{version}-app.txz
-Source2:             recompile_js.rb
+Source3: 	recompile_js.rb
-BuildRequires:       ruby(release) rubygems-devel > 1.3.1 ruby >= 2.2.2
+Source4: 	rails-%{version}-tools.txz
-BuildRequires:       rubygem(actionpack) = %{version} rubygem(mocha) rubygem(nio4r) rubygem(puma)
+
-BuildRequires:       %{_bindir}/redis-server rubygem(redis) rubygem(websocket-driver)
+BuildRequires:	ruby(release)
+BuildRequires:	rubygems-devel > 1.3.1
+BuildRequires:	ruby >= 2.2.2
+BuildRequires:	rubygem(actionpack) = %{version}
+BuildRequires:	rubygem(mocha)
+BuildRequires:	rubygem(nio4r)
+BuildRequires:	rubygem(puma)
+BuildRequires:	%{_bindir}/redis-server
+BuildRequires:	rubygem(redis)
+BuildRequires:	rubygem(hiredis) >= 0.6.3
+BuildRequires:	rubygem(websocket-driver)
 %if 0%{?recompile_js} > 0
-BuildRequires:       rubygem(coffee-script) rubygem(sprockets) nodejs
+BuildRequires:	rubygem(coffee-script)
+BuildRequires:	rubygem(sprockets)
+BuildRequires:	nodejs
 %endif
-BuildArch:           noarch
+BuildArch:	noarch
+
 %description
 Structure many real-time application concerns into channels over a single
 WebSocket connection.
 
-%package doc
+%package	doc
-Summary:             Documentation for %{name}
+Summary:	Documentation for %{name}
-Requires:            %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
-BuildArch:           noarch
+BuildArch:	noarch
-%description doc
+
+%description	doc
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
+%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -a2 -b4
-%setup -q -D -T -n  %{gem_name}-%{version} -a 1
-ln -s rails-%{version}/%{gem_name}/app app 
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 %build
 %if 0%{?recompile_js} > 0
-cp -a %{SOURCE2} .
+cp -a %{SOURCE3} .
 rm -rf lib/assets/compiled
 RUBYOPT=-Ilib ruby recompile_js.rb
 %endif
-gem build %{gem_name}.gemspec
+
+gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec
 %gem_install
 
 %install
@@ -51,14 +63,14 @@ cp -a .%{gem_dir}/* \
 
 %check
 pushd .%{gem_instdir}
-tar xzvf %{SOURCE1}
+ln -s %{_builddir}/tools ..
-ln -s rails-%{version}/%{gem_name}/test test
+mv %{_builddir}/test .
 mv test/client_test.rb{,.disable}
 mv test/subscription_adapter/postgresql_test.rb{,.disable}
 REDIS_DIR=$(mktemp -d)
 redis-server --dir $REDIS_DIR --pidfile $REDIS_DIR/redis.pid --daemonize yes
-ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
+ruby -rhiredis -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
-kill -INT $(cat $REDIS_DIR/redis.pid) || echo end
+kill -INT $(cat $REDIS_DIR/redis.pid)
 popd
 
 %files
@@ -67,6 +79,7 @@ popd
 %{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
+%{gem_instdir}/app
 
 %files doc
 %doc %{gem_docdir}
@@ -74,6 +87,9 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Fri May 04 2022 wangkerong <wangkerong@h-partners.com> - 6.1.4.1-1
+- Upgrade to 6.1.4.1
+
 * Mon Feb  8 2021 sunguoshuai <sunguoshuai@huawei.com> - 5.2.4.4-1
 - Upgrade to 5.2.4.4