rpms/redis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream 6.0.7 release.

Browse Source 
drop patch merged upstream
This commit is contained in:
Remi Collet 2020-09-01 09:15:37 +02:00
parent 70185f5606
commit 994dbf17e5
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -74,3 +74,5 @@ clog
/redis-6.0.5.tar.gz /redis-6.0.5.tar.gz
/redis-6.0.6.tar.gz /redis-6.0.6.tar.gz
/redis-doc-02423fd.tar.gz /redis-doc-02423fd.tar.gz
/redis-6.0.7.tar.gz
/redis-doc-2c335a8.tar.gz

13
redis.spec
View File

@ -12,15 +12,15 @@
# Commit IDs for the (unversioned) redis-doc repository # Commit IDs for the (unversioned) redis-doc repository
# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
%global doc_commit 02423fd2f5603ae300654613a51eaee13bc5cb80 %global doc_commit 2c335a8226789afae2b5a2ebbd689933b0a5e01a
%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
# %%{rpmmacrodir} not usable on EL-6 # %%{rpmmacrodir} not usable on EL-6
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: redis Name: redis
Version: 6.0.6 Version: 6.0.7
Release: 2%{?dist} Release: 1%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
# redis, linenoise, lzf, hiredis are BSD # redis, linenoise, lzf, hiredis are BSD
# lua is MIT # lua is MIT
@ -48,8 +48,6 @@ Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
# https://github.com/antirez/redis/pull/3494 - symlink # https://github.com/antirez/redis/pull/3494 - symlink
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
# https://github.com/redis/redis/pull/7543 - tail syntax
Patch0003: 0003-fix-deprecated-tail-syntax.patch
BuildRequires: gcc BuildRequires: gcc
%if %{with tests} %if %{with tests}
@ -130,7 +128,6 @@ administration and development.
mv ../%{name}-doc-%{doc_commit} doc mv ../%{name}-doc-%{doc_commit} doc
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1 %patch0002 -p1
%patch0003 -p1
mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/hiredis/COPYING COPYING-hiredis mv deps/hiredis/COPYING COPYING-hiredis
@ -278,6 +275,10 @@ exit 0
%changelog %changelog
* Tue Sep 1 2020 Remi Collet <remi@remirepo.net> - 6.0.7-1
- Upstream 6.0.7 release.
- drop patch merged upstream
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.6-2 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (redis-6.0.6.tar.gz) = bb60aff6e495b201fed814eb134e6ce2825429ef6bd52215c7369eec941318ba460d60ad7b0cef3684b3f992823d465869177dc1d0eb16886bfed598dff74f65 SHA512 (redis-6.0.7.tar.gz) = 08de811d38f012676f12721af6f98465a7a12bceac6b2787db2ce12953897a53cfa4a79db8f449d7296f778b9812a0e1a430cd0df9101c9735ccb82debb144cc
SHA512 (redis-doc-02423fd.tar.gz) = 4be8fdd0c5671b1edf814897b9033c59366159513e1ad428a2101df353682d7b74cd88ac5dba4278917d6c796d4ccb76c8da6cc3043b8d9013c2971ce3a8f69e SHA512 (redis-doc-2c335a8.tar.gz) = 6aa7ad5bc757748928bd5bdbc7d457a5772ad70f06026a3d83da9dc434dfaec29b1394d5e3d4a61d40c7ebd7b80c17c19ff83857dac9fa1d648a29da6b1dfdba