diff --git a/.gitignore b/.gitignore index a29b7ee348b3c740884390536bd6bb77f8b440b4..051fd1571a8d5a77becd139bfbfd83d22d4137c3 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ clog /redis-doc-b9d39b1.tar.gz /redis-4.0.10.tar.gz /redis-4.0.11.tar.gz +/redis-5.0.0.tar.gz +/redis-doc-65e6865.tar.gz diff --git a/redis-sentinel.service b/redis-sentinel.service index 15463cf5c72591d2ecff6b571d266a45c3725ce6..3e2d5648b1237eb718d29d0aa217d8143debbd17 100644 --- a/redis-sentinel.service +++ b/redis-sentinel.service @@ -1,6 +1,8 @@ [Unit] Description=Redis Sentinel After=network.target +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd diff --git a/redis.service b/redis.service index 88e9edcbbf6c0e21d70fde9a9fa2a9ce1688e8cc..adbcaec356cbfe108922f0bbc84415a097263cf5 100644 --- a/redis.service +++ b/redis.service @@ -1,6 +1,8 @@ [Unit] Description=Redis persistent key-value database After=network.target +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd diff --git a/redis.spec b/redis.spec index 10acca0cdf57343d11cebbdf52ae70177e561a9d..8a7ffbd0ff6282012bed4746258f029d03046875 100644 --- a/redis.spec +++ b/redis.spec @@ -24,14 +24,14 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -%global doc_commit b9d39b104e0beff9e70b3d738c17d48491d6646a +%global doc_commit 65e68652b6cae915ea952f63edf8973cccc32567 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) # %%{rpmmacrodir} not usable on EL-6 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: redis -Version: 4.0.11 +Version: 5.0.0 Release: 1%{?dist} Summary: A persistent key-value database # redis, linenoise, lzf, hiredis are BSD @@ -358,6 +358,10 @@ fi %changelog +* Thu Oct 18 2018 Nathan Scott - 5.0.0-1 +- Update systemd service files for network-online requirement +- Upstream 5.0.0 release. + * Thu Aug 09 2018 Nathan Scott - 4.0.11-1 - Drop the pandoc build dependency, install only markdown. - Upstream 4.0.11 release. diff --git a/sources b/sources index 3f748e6174df4ac98a24bb9df2acacd5604769eb..fc6d51f65aeab6e80ebb0cb9ab83f97a9e10427e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-doc-b9d39b1.tar.gz) = 96e29a767d773578c971979655ae0a0e1144f2ae9d2553e14b019a42c43cfeddb16eb62a250c4be345a37170e677c7d154f9969f6faa9b78afb613afea83f948 -SHA512 (redis-4.0.11.tar.gz) = f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0 +SHA512 (redis-5.0.0.tar.gz) = 818277cf8c14eb5f0b864e936f657c8021a3614a76dda8975d82b20ab4e3983731363b7b527fb504fd41292304de079f78702503fca867ac6f45a97a391eec07 +SHA512 (redis-doc-65e6865.tar.gz) = 4ce1fc9e3a2e76197be88ac19f4281dff28ed959f07e55aff5cadcd42dd76b07e3f948a7675c0ae45c36e1ea7999aa5899ca2a2106bafceb70f2bf74a0a50d0c