diff options
| -rw-r--r-- | redis.spec | 27 |
1 files changed, 10 insertions, 17 deletions
@@ -24,18 +24,15 @@ # Tests fail in mock, not in local build. %bcond_with tests -# Pre-version are only available in github %global upstream_ver 7.2 -%global upstream_pre RC1 -%global gh_commit e26a769d9627ebecb8607375580970a740348956 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner redis -%global gh_project redis +%global upstream_pre rc1 # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" # https://github.com/redis/redis-doc/commits/master -%global doc_commit 1a2f1b653f4b0b421eb1b00085b6ebec810f2e48 +%global gh_owner redis +%global gh_project redis +%global doc_commit 80258ecc251e8f7209d480cad77128ba5a43f968 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) # %%{_rpmmacrodir} not usable on EL-6 - EL-7 (without epel-rpms-macros) @@ -52,11 +49,7 @@ Group: Applications/Databases # fpconv: BSL-1.0 License: BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 URL: http://redis.io -%if 0%{?upstream_pre:1} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{upstream_ver}%{upstream_pre}-%{gh_short}.tar.gz -%else -Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz -%endif +Source0: https://download.redis.io/releases/%{name}-%{upstream_ver}%{?upstream_pre:-%{upstream_pre}}.tar.gz Source1: %{name}.logrotate Source2: %{name}-sentinel.service Source3: %{name}.service @@ -180,11 +173,7 @@ and removal, status checks, resharding, rebalancing, and other operations. %endif %prep -%if 0%{?upstream_pre:1} -%setup -q -n %{gh_project}-%{gh_commit} -b 10 -%else -%setup -q -b 10 -%endif +%setup -q -n %{name}-%{upstream_ver}%{?upstream_pre:-%{upstream_pre}} -b 10 mv ../%{name}-doc-%{doc_commit} doc %patch0001 -p1 @@ -419,6 +408,10 @@ fi %changelog +* Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 7.2~rc1-1 +- rebuild with upstream sources instead of git snapshot +- refresh documentation + * Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 7.2~RC1-1 - Redis 7.2 RC1 (7.1.240) Released Wed Mar 22 12:00:00 IST 2023 |