diff options
| -rw-r--r-- | 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch | 16 | ||||
| -rw-r--r-- | 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch | 15 | ||||
| -rw-r--r-- | redis.spec | 10 |
3 files changed, 24 insertions, 17 deletions
diff --git a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch index ab62c0c..d18bbb0 100644 --- a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +++ b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -1,4 +1,4 @@ -From c7958ad1c0d615b81276ec2d4dbc1bf6a67dcc4d Mon Sep 17 00:00:00 2001 +From ae2235dab50c86480ee37f50119af6668f312ba3 Mon Sep 17 00:00:00 2001 From: Remi Collet <fedora@famillecollet.com> Date: Thu, 8 Sep 2016 14:51:15 +0200 Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - @@ -7,12 +7,12 @@ Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) redis.conf can also be used for sentinel.conf --- - man/man1/redis-benchmark.1 | 132 ++++++++++++++++++++++++++++++++++ - man/man1/redis-check-aof.1 | 60 ++++++++++++++++ - man/man1/redis-check-rdb.1 | 53 ++++++++++++++ - man/man1/redis-cli.1 | 171 +++++++++++++++++++++++++++++++++++++++++++++ - man/man1/redis-server.1 | 117 +++++++++++++++++++++++++++++++ - man/man5/redis.conf.5 | 57 +++++++++++++++ + man/man1/redis-benchmark.1 | 132 ++++++++++++++++++++++++++++ + man/man1/redis-check-aof.1 | 60 +++++++++++++ + man/man1/redis-check-rdb.1 | 53 ++++++++++++ + man/man1/redis-cli.1 | 171 +++++++++++++++++++++++++++++++++++++ + man/man1/redis-server.1 | 117 +++++++++++++++++++++++++ + man/man5/redis.conf.5 | 57 +++++++++++++ 6 files changed, 590 insertions(+) create mode 100644 man/man1/redis-benchmark.1 create mode 100644 man/man1/redis-check-aof.1 @@ -648,5 +648,5 @@ index 0000000..1e0c9c9 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- -2.13.5 +2.20.1 diff --git a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch index ce09350..3d90660 100644 --- a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +++ b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch @@ -1,18 +1,18 @@ -From 992c773e70462a6fbe1536e18e673c9ab55d5901 Mon Sep 17 00:00:00 2001 +From 85d847361b519dca524178e3197dbb0ed24e0cb5 Mon Sep 17 00:00:00 2001 From: Remi Collet <fedora@famillecollet.com> Date: Fri, 9 Sep 2016 17:23:27 +0200 -Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of duplicating - the binary +Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of + duplicating the binary --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index fdbe36a..c3083f8 100644 +index 2a68649..585c95b 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -287,6 +287,6 @@ install: all +@@ -307,9 +307,9 @@ install: all $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) @@ -21,6 +21,9 @@ index fdbe36a..c3083f8 100644 @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) + + uninstall: + rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} -- -2.13.5 +2.20.1 @@ -31,7 +31,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} # Pre-version are only available in github -%global upstream_ver 5.0.3 +%global upstream_ver 5.0.4 #global upstream_pre RC6 %global gh_commit a1e79fc9b2f42f04a8ab59c05c3228931adcd0a6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -41,7 +41,7 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" # https://github.com/antirez/redis-doc/commits/master -%global doc_commit a59c016fabe113539731621c99d52ef0d656dbae +%global doc_commit 8c322492b0ad14067bd4cebce20f3509d989370d %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) # %%{rpmmacrodir} not usable on EL-6 @@ -197,7 +197,7 @@ mv deps/jemalloc/COPYING COPYING-jemalloc mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/hiredis/COPYING COPYING-hiredis -# Configuration file changes and additions +# Configuration file changes sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf sed -i -e 's|^logfile .*$|logfile /var/log/redis/sentinel.log|g' sentinel.conf sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf @@ -401,6 +401,10 @@ fi %changelog +* Tue Mar 19 2019 Nathan Scott <nathans@redhat.com> - 5.0.4-1 +- Upstream 5.0.4 release and redis-doc updates. +- Fix sentinel.conf logfile line addition. + * Wed Dec 12 2018 Remi Collet <remi@remirepo.net> - 5.0.3-1 - Redis 5.0.3 - Released Tue Dec 11 18:17:26 CET 2018 - Upgrade urgency HIGH: Redis 5 is consolidating, upgrading is a good idea. |