diff --git a/redis-4.0.1.gem b/redis-4.0.1.gem deleted file mode 100644 index f04f002..0000000 Binary files a/redis-4.0.1.gem and /dev/null differ diff --git a/redis-4.6.0.gem b/redis-4.6.0.gem new file mode 100644 index 0000000..d8c4efe Binary files /dev/null and b/redis-4.6.0.gem differ diff --git a/redis-test.conf b/redis-test.conf deleted file mode 100644 index 3612b2b..0000000 --- a/redis-test.conf +++ /dev/null @@ -1,9 +0,0 @@ -dir ./test/db -pidfile ./redis.pid -port 6381 -unixsocket ./redis.sock -timeout 300 -loglevel debug -logfile stdout -databases 16 -daemonize yes diff --git a/rubygem-redis.spec b/rubygem-redis.spec index 5cf954e..718252e 100644 --- a/rubygem-redis.spec +++ b/rubygem-redis.spec @@ -1,14 +1,14 @@ %global gem_name redis Name: rubygem-%{gem_name} -Version: 4.0.1 +Version: 4.6.0 Release: 1 Summary: A Ruby client library for Redis License: MIT URL: https://github.com/redis/redis-rb Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# We will use this static file to start a testing redis server instance -Source1: redis-test.conf -BuildRequires: ruby ruby(release) rubygems-devel rubygem(test-unit) redis +Source1: https://github.com/redis/redis-rb/archive/refs/tags/v%{version}.tar.gz +BuildRequires: ruby ruby(release) rubygems-devel rubygem(test-unit) redis make rubygem(hiredis) rubygem(minitest) rubygem(mocha) +BuildRequires: %{_bindir}/redis-server BuildArch: noarch %description A Ruby client that tries to match Redis' API one-to-one, while still @@ -22,26 +22,34 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +%setup -q -n %{gem_name}-%{version} -b 1 %build - -%check -pushd .%{gem_instdir} -cp -p %{SOURCE1} test/test.conf -redis-server test/test.conf -LANG=C.UTF-8 -export SOCKET_PATH="test/db/redis.sock" -ruby -Ilib -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' -kill -INT `cat test/db/redis.pid` -popd +gem build ../%{gem_name}-%{version}.gemspec +%gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -rm -r %{buildroot}%{gem_instdir}/test + +%check +pushd .%{gem_instdir} +cp -a %{_builddir}/redis-rb-%{version}/{makefile,test} . +sed -i "s/bundle exec rake test/ruby -Ilib:test -e \"Dir.glob('.\/test\/**\/*_test.rb').sort.each {|t| require t}\"/" \ + makefile +mkdir bin +echo '#!/usr/bin/sh' > bin/build +chmod a+x bin/build +mv %{_builddir}/redis-rb-%{version}/bin/cluster_creator bin/ +LANG=C.UTF-8 +for driver in ruby hiredis ; do +export DRIVER=$driver +make BINARY=$(which redis-server) REDIS_CLIENT=$(which redis-cli) BUILD_DIR='${TMP}' +sleep 1 +done +popd + %files %dir %{gem_instdir} @@ -55,13 +63,10 @@ rm -r %{buildroot}%{gem_instdir}/test %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/README.md -%{gem_instdir}/%{gem_name}.gemspec -%{gem_instdir}/Gemfile -%{gem_instdir}/makefile -%{gem_instdir}/bors.toml -%{gem_instdir}/benchmarking/ -%{gem_instdir}/examples/ %changelog +* Thu Jun 30 2022 wulei - 4.6.0-1 +- Upgrade to 4.6.0 + * Tue Aug 18 2020 huangyangke - 4.0.1-1 - package init diff --git a/v4.6.0.tar.gz b/v4.6.0.tar.gz new file mode 100644 index 0000000..ddb81e3 Binary files /dev/null and b/v4.6.0.tar.gz differ