diff options
| -rw-r--r-- | 0001-redis-3.2-redis-conf.patch | 4 | ||||
| -rw-r--r-- | 0003-redis-2.8.11-use-system-jemalloc.patch | 2 | ||||
| -rw-r--r-- | redis.spec | 22 | 
3 files changed, 23 insertions, 5 deletions
diff --git a/0001-redis-3.2-redis-conf.patch b/0001-redis-3.2-redis-conf.patch index 2803349..5eb9a58 100644 --- a/0001-redis-3.2-redis-conf.patch +++ b/0001-redis-3.2-redis-conf.patch @@ -1,7 +1,7 @@  diff -up ./redis.conf.rpmconf ./redis.conf  --- ./redis.conf.rpmconf	2015-12-23 13:35:32.000000000 +0100  +++ ./redis.conf	2016-01-15 16:32:22.491355290 +0100 -@@ -140,7 +140,7 @@ loglevel notice +@@ -160,7 +160,7 @@ loglevel notice   # Specify the log file name. Also the empty string can be used to force   # Redis to log on the standard output. Note that if you use standard   # output for logging but daemonize, logs will be sent to /dev/null @@ -10,7 +10,7 @@ diff -up ./redis.conf.rpmconf ./redis.conf   # To enable logging to the system logger, just set 'syslog-enabled' to yes,   # and optionally update the other syslog parameters to suit your needs. -@@ -224,7 +224,7 @@ dbfilename dump.rdb +@@ -244,7 +244,7 @@ dbfilename dump.rdb   # The Append Only File will also be created inside this directory.   #   # Note that you must specify a directory here, not a file name. diff --git a/0003-redis-2.8.11-use-system-jemalloc.patch b/0003-redis-2.8.11-use-system-jemalloc.patch index cf1b231..8c1d997 100644 --- a/0003-redis-2.8.11-use-system-jemalloc.patch +++ b/0003-redis-2.8.11-use-system-jemalloc.patch @@ -1,6 +1,6 @@  --- a/src/Makefile	2013-04-30 15:15:56.000000000 +0200  +++ b/src/Makefile	2013-06-19 12:58:12.345612310 +0200 -@@ -89,9 +89,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) +@@ -93,9 +93,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)   endif   ifeq ($(MALLOC),jemalloc) @@ -27,8 +27,8 @@  %global gh_project   redis  Name:             redis -Version:          3.2.1 -Release:          2%{?dist} +Version:          3.2.2 +Release:          1%{?dist}  Summary:          A persistent key-value database  Group:            Applications/Databases @@ -116,6 +116,18 @@ Documentation: http://redis.io/documentation  %patch1 -p1 -b .pic  %patch2 -p1 -b .jem +# No hidden build. +sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile +sed -i -e 's|$(QUIET_CC)||g' src/Makefile +sed -i -e 's|$(QUIET_LINK)||g' src/Makefile +sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile +# Ensure deps are built with proper flags +sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile +sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile +sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile +sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/linenoise/Makefile +sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/linenoise/Makefile +  %build  rm -rvf deps/jemalloc @@ -246,6 +258,12 @@ fi  %changelog +* Fri Jul 29 2016 Remi Collet <remi@fedoraproject.org> - 3.2.2-1 +- Redis 3.2.2 - Release date: Thu Jul 28 14:14:54 CEST 2016 +- Upgrade urgency MODERATE: +  A Redis server and a Sentinel crash are now fixed. +  GEORADIUS errors in reported entries are fixed. +  * Fri Jun 24 2016 Remi Collet <remi@fedoraproject.org> - 3.2.1-2  - fix %%postun scriptlet, thanks Matthias  | 
