summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-09-04 20:29:20 +0200
committerRemi Collet <fedora@famillecollet.com>2014-09-04 20:29:20 +0200
commit5d9fa3923a03b577eca13ba60fb95b36d9e5df72 (patch)
tree74f09a7d895a7393dbf64c97ab942f4631a34c7d
parentadaa108591d18de7a6118eb526ee9ee536044cc2 (diff)
redis: 2.8.14
-rw-r--r--redis-deps-PIC.patch12
-rw-r--r--redis-deps-unbundle-jemalloc.patch2
-rw-r--r--redis.spec12
3 files changed, 16 insertions, 10 deletions
diff --git a/redis-deps-PIC.patch b/redis-deps-PIC.patch
index 4d9b958..d29cdfa 100644
--- a/redis-deps-PIC.patch
+++ b/redis-deps-PIC.patch
@@ -1,15 +1,15 @@
---- a/deps/Makefile
-+++ a/deps/Makefile
+--- a/deps/Makefile.pic 2014-09-04 20:14:53.780910375 +0200
++++ a/deps/Makefile 2014-09-04 20:15:49.278133046 +0200
@@ -58,7 +58,7 @@
LUA_CFLAGS= -D__C99FEATURES__=1
endif
-
+
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
+LUA_CFLAGS+= -O2 -Wall -fPIC -DLUA_ANSI $(CFLAGS)
LUA_LDFLAGS+= $(LDFLAGS)
-
- lua: .make-prerequisites
---- a/deps/linenoise/Makefile
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis). These defines make it easier
+--- a/deps/linenoise/Makefile
+++ a/deps/linenoise/Makefile
@@ -2,7 +2,7 @@ STD=
WARN= -Wall
diff --git a/redis-deps-unbundle-jemalloc.patch b/redis-deps-unbundle-jemalloc.patch
index 0ae0fc7..cf1b231 100644
--- a/redis-deps-unbundle-jemalloc.patch
+++ b/redis-deps-unbundle-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
-@@ -79,9 +79,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+@@ -89,9 +89,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
endif
ifeq ($(MALLOC),jemalloc)
diff --git a/redis.spec b/redis.spec
index 0a1b5b1..50ce0bf 100644
--- a/redis.spec
+++ b/redis.spec
@@ -10,7 +10,7 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: redis
-Version: 2.8.13
+Version: 2.8.14
Release: 1%{?dist}
Summary: A persistent key-value database
@@ -192,7 +192,9 @@ fi
%files
%defattr(-,root,root,-)
-%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING README
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc 00-RELEASENOTES BUGS CONTRIBUTING README
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
@@ -212,8 +214,12 @@ fi
%changelog
+* Thu Sep 4 2014 Remi Collet <remi@fedoraproject.org> - 2.8.14-1
+- Redis 2.8.14 - Release date: 1 Sep 2014
+ upgrade urgency: HIGH for Lua scripting users, otherwise LOW.
+
* Tue Jul 15 2014 Remi Collet <remi@fedoraproject.org> - 2.8.13-1
-- Redis 2.8.12 - Release date: 14 Jul 2014
+- Redis 2.8.13 - Release date: 14 Jul 2014
upgrade urgency: LOW for Redis and Sentinel
* Tue Jun 24 2014 Remi Collet <remi@fedoraproject.org> - 2.8.12-1