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

Update to upstream v6 release; add fixes from Remi

Browse Source
This commit is contained in:
Nathan Scott 2020-05-01 09:48:17 +10:00
parent b53d57cbfe
commit df4bd8c0c0
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -65,3 +65,5 @@ clog
/redis-doc-4cd19bb.tar.gz /redis-doc-4cd19bb.tar.gz
/redis-5.0.8.tar.gz /redis-5.0.8.tar.gz
/redis-doc-3a41bc3.tar.gz /redis-doc-3a41bc3.tar.gz
/redis-6.0.0.tar.gz
/redis-doc-ee32a19.tar.gz

2
redis-sentinel.service
View File

@ -5,7 +5,7 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
[Service] [Service]
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no --supervised systemd
ExecStop=/usr/libexec/redis-shutdown redis-sentinel ExecStop=/usr/libexec/redis-shutdown redis-sentinel
Type=notify Type=notify
User=redis User=redis

2
redis.service
View File

@ -5,7 +5,7 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
[Service] [Service]
ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no --supervised systemd
ExecStop=/usr/libexec/redis-shutdown ExecStop=/usr/libexec/redis-shutdown
Type=notify Type=notify
User=redis User=redis

13
redis.spec
View File

@ -12,14 +12,14 @@
# 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 3a41bc371a894cf63af99046f61052614379f7b0 %global doc_commit ee32a19c1a8ae372c60aea6ed7025f76a93a68b1
%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: 5.0.8 Version: 6.0.0
Release: 1%{?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
@ -53,7 +53,9 @@ BuildRequires: gcc
BuildRequires: procps-ng BuildRequires: procps-ng
BuildRequires: tcl BuildRequires: tcl
%endif %endif
BuildRequires: systemd BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-devel
BuildRequires: openssl-devel
# redis-trib functionality migrated to redis-cli # redis-trib functionality migrated to redis-cli
Obsoletes: redis-trib < 5 Obsoletes: redis-trib < 5
# Required for redis-shutdown # Required for redis-shutdown
@ -142,7 +144,7 @@ if test "$api" != "%{redis_modules_abi}"; then
exit 1 exit 1
fi fi
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} %global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
%build %build
make %{?_smp_mflags} %{make_flags} all make %{?_smp_mflags} %{make_flags} all
@ -272,6 +274,9 @@ exit 0
%changelog %changelog
* Fri May 01 2020 Nathan Scott <nathans@redhat.com> - 6.0.0-1
- Upstream release.
* Fri Mar 13 2020 Nathan Scott <nathans@redhat.com> - 5.0.8-1 * Fri Mar 13 2020 Nathan Scott <nathans@redhat.com> - 5.0.8-1
- Upstream 5.0.8 release. - Upstream 5.0.8 release.

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (redis-5.0.8.tar.gz) = 106a74ab910267472fb418fdeb4f39e29efe9d73ed5af78b7847c91eaabd473dd729a63078e72d8e87c842169502946e9a0a97c42dea415db82732864c7c46dc SHA512 (redis-6.0.0.tar.gz) = a28ed192610d9a8dc1f8988237731f8ac331997c90e7260f359744156222b45519745c571a2e848770230c284a2e467a1f42f6a608417c4f389e18d4c4342b2e
SHA512 (redis-doc-3a41bc3.tar.gz) = 457622a5fa969562949b58ae5089f315414f2192ae504eca124ae8c638182d23a0d1ce23ede8dcc46157994e42fa961f4865ef2769657d7f1d0b5b84796bc012 SHA512 (redis-doc-ee32a19.tar.gz) = 7158a24d35fdb811fcc398c7caca489912675784cdbc0b26cbb8f4c428814d36c32b986b3df3048d186ddae92290a70706b671d382f1afa04374d966e7e40ceb