summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-redis-3.2-redis-conf.patch2
-rw-r--r--0003-redis-2.8.11-use-system-jemalloc.patch14
-rw-r--r--0003-redis-3.2.5-use-system-jemalloc.patch15
-rw-r--r--redis.spec10
4 files changed, 23 insertions, 18 deletions
diff --git a/0001-redis-3.2-redis-conf.patch b/0001-redis-3.2-redis-conf.patch
index 5eb9a58..f8d8791 100644
--- a/0001-redis-3.2-redis-conf.patch
+++ b/0001-redis-3.2-redis-conf.patch
@@ -22,7 +22,7 @@ diff -up ./redis.conf.rpmconf ./redis.conf
diff -up ./sentinel.conf.rpmconf ./sentinel.conf
--- ./sentinel.conf.rpmconf 2015-12-23 13:35:32.000000000 +0100
+++ ./sentinel.conf 2016-01-15 16:32:22.491355290 +0100
-@@ -4,6 +4,11 @@
+@@ -20,6 +20,11 @@
# The port that this sentinel instance will run on
port 26379
diff --git a/0003-redis-2.8.11-use-system-jemalloc.patch b/0003-redis-2.8.11-use-system-jemalloc.patch
deleted file mode 100644
index 8c1d997..0000000
--- a/0003-redis-2.8.11-use-system-jemalloc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/Makefile 2013-04-30 15:15:56.000000000 +0200
-+++ b/src/Makefile 2013-06-19 12:58:12.345612310 +0200
-@@ -93,9 +93,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
- endif
-
- ifeq ($(MALLOC),jemalloc)
-- DEPENDENCY_TARGETS+= jemalloc
-- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
-- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
-+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+ FINAL_LIBS+= -ljemalloc -ldl
- endif
-
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/0003-redis-3.2.5-use-system-jemalloc.patch b/0003-redis-3.2.5-use-system-jemalloc.patch
new file mode 100644
index 0000000..f8d254c
--- /dev/null
+++ b/0003-redis-3.2.5-use-system-jemalloc.patch
@@ -0,0 +1,15 @@
+diff -up src/Makefile.jem src/Makefile
+--- src/Makefile.jem 2016-10-27 11:00:29.486075147 +0200
++++ src/Makefile 2016-10-27 11:02:33.554729427 +0200
+@@ -103,9 +103,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+
+ ifeq ($(MALLOC),jemalloc)
+- DEPENDENCY_TARGETS+= jemalloc
+- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
++ FINAL_LIBS+= -ljemalloc -ldl
+ endif
+
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/redis.spec b/redis.spec
index dfa7d68..59e1ecd 100644
--- a/redis.spec
+++ b/redis.spec
@@ -27,7 +27,7 @@
%global gh_project redis
Name: redis
-Version: 3.2.4
+Version: 3.2.5
Release: 1%{?dist}
Summary: A persistent key-value database
@@ -51,7 +51,7 @@ Source9: %{name}-limit-init
# Update configuration for Fedora
Patch0: 0001-redis-3.2-redis-conf.patch
Patch1: 0002-redis-3.2-deps-library-fPIC-performance-tuning.patch
-Patch2: 0003-redis-2.8.11-use-system-jemalloc.patch
+Patch2: 0003-redis-3.2.5-use-system-jemalloc.patch
# https://github.com/antirez/redis/pull/3491 - man pages
Patch3: %{name}-pr3491.patch
@@ -118,7 +118,7 @@ Documentation: http://redis.io/documentation
%patch0 -p1 -b .rpmconf
%patch1 -p1 -b .pic
-%patch2 -p1 -b .jem
+%patch2 -p0 -b .jem
%patch3 -p1
%patch4 -p1 -b .old
@@ -269,6 +269,10 @@ fi
%changelog
+* Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 3.2.5-1
+- Redis 3.2.5 - Released Wed Oct 26 09:16:40 CEST 2016
+- Upgrade urgency LOW: This release only fixes a compilation issue
+
* Mon Sep 26 2016 Remi Collet <remi@fedoraproject.org> - 3.2.4-1
- Redis 3.2.4 - Released Mon Sep 26 08:58:21 CEST 2016
- Upgrade urgency CRITICAL: Redis 3.2 and unstable contained