rebase to 6.2.6

refresh documentation
use proper license file for documentation

Resolves:  #2011485
Resolves:  #2011498
Resolves:  #2011559
Resolves:  #2011569
Resolves:  #2011579
Resolves:  #2012193
Resolves:  #2012201
Resolves:  #2013992
This commit is contained in:
Remi Collet 2021-11-08 11:21:01 +01:00
parent c1d48c1043
commit 8d691e9f5a
3 changed files with 14 additions and 7 deletions

2
.gitignore vendored
View File

@ -89,3 +89,5 @@ clog
/redis-doc-42ccc96.tar.gz /redis-doc-42ccc96.tar.gz
/redis-6.2.3.tar.gz /redis-6.2.3.tar.gz
/redis-doc-6fca484.tar.gz /redis-doc-6fca484.tar.gz
/redis-6.2.6.tar.gz
/redis-doc-3fdb6df.tar.gz

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 6fca484937fe6d97e2065769a90d16b4caf9dc32 %global doc_commit 3fdb6df44ecd5c4d99ea52a0133177f5ebc24805
%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.2.3 Version: 6.2.6
Release: 3%{?dist} Release: 1%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
# redis, jemalloc, linenoise, lzf, hiredis are BSD # redis, jemalloc, linenoise, lzf, hiredis are BSD
# lua is MIT # lua is MIT
@ -289,13 +289,18 @@ fi
%{macrosdir}/* %{macrosdir}/*
%files doc %files doc
# main package is not required # specific for documentation (CC-BY-SA)
%license COPYING %license doc/LICENSE
%docdir %{_docdir}/%{name} %docdir %{_docdir}/%{name}
%{_docdir}/%{name} %{_docdir}/%{name}
%changelog %changelog
* Wed Nov 3 2021 Remi Collet <remi@remirepo.net> - 6.2.6-1
- rebase to 6.2.6 #2013992
- refresh documentation
- use proper license file for documentation
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.3-3 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.3-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

View File

@ -1,2 +1,2 @@
SHA512 (redis-6.2.3.tar.gz) = 0a020aaa5664ed419a30e85d3b5c79fe69353067b755421c702f89ca923f1ba7794b4792f4a44049e38936f221363153c9ffcfb6fa232731b224d20c2982ac68 SHA512 (redis-6.2.6.tar.gz) = 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
SHA512 (redis-doc-6fca484.tar.gz) = bd78719723dd18802a7130a21ecb63715a70245a9b67aea32e256c03a2701e03bfa846f081c70a144299670d11cdf2b394bb00363f85607b7d280171cc50568f SHA512 (redis-doc-3fdb6df.tar.gz) = 9444a3dc45075febeb2823b415997c2d5e512558aba12aca1b63db941c81d79050595b7feb553a45349cbdb34ff097a67b925fd542a582d8ca5ba9f0a8e9a638