From 9a18a4addb34721a995e5068f13ed7b8b201eae0 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 17 Dec 2014 07:21:44 +0100
Subject: redis 2.8.19

---
 redis-2.8.18-el5.patch | 31 -------------------------------
 redis.spec             | 14 +++++++-------
 2 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 redis-2.8.18-el5.patch

diff --git a/redis-2.8.18-el5.patch b/redis-2.8.18-el5.patch
deleted file mode 100644
index ac43df1..0000000
--- a/redis-2.8.18-el5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ff25d1896d3befe184aa1adebf5d5e961f5d4b15 Mon Sep 17 00:00:00 2001
-From: antirez <antirez@gmail.com>
-Date: Fri, 5 Dec 2014 10:51:09 +0100
-Subject: [PATCH] Simplify lua_cmsgpack macro and fix build on old Linux
- distros.
-
-Thanks to @badboy for the help in checking the build after the fix.
----
- deps/lua/src/lua_cmsgpack.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/deps/lua/src/lua_cmsgpack.c b/deps/lua/src/lua_cmsgpack.c
-index 6aa04e2..4ccf07f 100644
---- a/deps/lua/src/lua_cmsgpack.c
-+++ b/deps/lua/src/lua_cmsgpack.c
-@@ -18,14 +18,8 @@
-     #define LUACMSGPACK_MAX_NESTING  16 /* Max tables nesting. */
- #endif
- 
--#if (_XOPEN_SOURCE >= 600 || _ISOC99_SOURCE || _POSIX_C_SOURCE >= 200112L)
--    #define IS_FINITE(x) isfinite(x)
--#else
--    #define IS_FINITE(x) ((x) == (x) && (x) + 1 > (x))
--#endif
--
- /* Check if float or double can be an integer without loss of precision */
--#define IS_INT_TYPE_EQUIVALENT(x, T) (IS_FINITE(x) && (T)(x) == (x))
-+#define IS_INT_TYPE_EQUIVALENT(x, T) (!isinf(x) && (T)(x) == (x))
- 
- #define IS_INT64_EQUIVALENT(x) IS_INT_TYPE_EQUIVALENT(x, int64_t)
- #define IS_INT_EQUIVALENT(x) IS_INT_TYPE_EQUIVALENT(x, int)
diff --git a/redis.spec b/redis.spec
index dbc4ac5..0f9f368 100644
--- a/redis.spec
+++ b/redis.spec
@@ -16,8 +16,8 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:             redis
-Version:          2.8.18
-Release:          2%{?dist}
+Version:          2.8.19
+Release:          1%{?dist}
 Summary:          A persistent key-value database
 
 Group:            Applications/Databases
@@ -38,8 +38,6 @@ Source9:          %{name}-limit-init
 Patch0:           0001-redis-2.8.18-redis-conf.patch
 Patch1:           0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch
 Patch2:           0003-redis-2.8.11-use-system-jemalloc.patch
-# For old RHEL-5
-Patch9:           redis-2.8.18-el5.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if !0%{?el5}
@@ -81,8 +79,6 @@ Documentation: http://redis.io/documentation
 %patch1 -p1 -b .pic
 %patch2 -p1 -b .jem
 
-%patch9 -p1 -b .upstream
-
 
 %build
 rm -rvf deps/jemalloc
@@ -136,7 +132,7 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-*
 
 # create redis-sentinel command as described on
 # http://redis.io/topics/sentinel
-ln -s %{name}-server %{buildroot}%{_bindir}/%{name}-sentinel
+ln -sf %{name}-server %{buildroot}%{_bindir}/%{name}-sentinel
 
 # Install redis-shutdown
 install -pDm755 %{SOURCE7} %{buildroot}%{_bindir}/%{name}-shutdown
@@ -236,6 +232,10 @@ fi
 
 
 %changelog
+* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> - 2.8.19-1
+- Redis 2.8.19 - Release date: 16 Dec 2014
+  upgrade urgency: LOW for both Redis and Sentinel.
+
 * Sat Dec 13 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-2
 - provides /etc/systemd/system/redis.service.d/limit.conf
   and /etc/systemd/system/redis-sentinel.service.d/limit.conf
-- 
cgit