summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-21 19:15:30 +0200
committerRemi Collet <remi@remirepo.net>2017-05-21 19:15:30 +0200
commitba87f8dcf1160ebf110b79f8011b4df1fbcee5ef (patch)
tree970997facc91f0808018d61602b50cad90078e5f
parent671223ca463433c1b89b5ba2e1bbaa8083a461fa (diff)
v4.0.0RC3
-rw-r--r--redis-dev.spec13
-rw-r--r--redis-pr3491.patch25
2 files changed, 34 insertions, 4 deletions
diff --git a/redis-dev.spec b/redis-dev.spec
index 5a6ca3e..98d1345 100644
--- a/redis-dev.spec
+++ b/redis-dev.spec
@@ -20,15 +20,15 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
# Pre-version are only available in github
-%global prever RC2
-%global gh_commit 8226f2c3a717649788dc5f06c4d9ebdfbe8bb9c9
+%global prever RC3
+%global gh_commit 51b12ed1b5dccd6234e0dc1d3f76996420bcf5a9
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner antirez
%global gh_project redis
Name: redis
Version: 4.0.0
-Release: 0.2.%{prever}%{?dist}
+Release: 0.3.%{prever}%{?dist}
Summary: A persistent key-value database
Group: Applications/Databases
@@ -150,6 +150,10 @@ make %{?_smp_mflags} V=1 \
%check
%if %{with_tests}
+# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
+# with a modified Jemalloc like the one shipped by default with the Redis source distribution
+sed -e '/memefficiency/d' -i tests/test_helper.tcl
+
make test
make test-sentinel
%else
@@ -269,6 +273,9 @@ fi
%changelog
+* Mon Apr 24 2017 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.3.RC3
+- update to 4.0.0-RC3 (3.9.103)
+
* Tue Dec 6 2016 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.2.RC2
- update to 4.0.0-RC2 (3.9.102)
diff --git a/redis-pr3491.patch b/redis-pr3491.patch
index 6c52694..073972e 100644
--- a/redis-pr3491.patch
+++ b/redis-pr3491.patch
@@ -1,7 +1,7 @@
From 8295483fcee6c1232ac801ff91f66e21f9d23d80 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 8 Sep 2016 14:51:15 +0200
-Subject: [PATCH] 1st man pageis for - redis-cli - redis-benchmark -
+Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark -
redis-check-aof - redis-check-rdb - redis-server - redis.conf
as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked)
@@ -647,3 +647,26 @@ index 0000000..1e0c9c9
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+From aabbe7ffd278a09e7583ce96e6aa781f8cd81ab9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 24 Apr 2017 17:47:51 +0200
+Subject: [PATCH 2/2] typo
+
+---
+ man/man1/redis-server.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/man1/redis-server.1 b/man/man1/redis-server.1
+index d6edd25..6349a25 100644
+--- a/man/man1/redis-server.1
++++ b/man/man1/redis-server.1
+@@ -22,7 +22,7 @@ used as database, cache and message broker, found at
+ The \fBredis\-server\fP command is a command line to launch a Redis server.
+ .LP
+ The \fBredis\-sentinel\fP command is a symbolic link to the \fBredis\-server\fP
+-command which imply the \fB\-\-sentionel\fP option.
++command and implies the \fB\-\-sentionel\fP option.
+
+ .SH OPTIONS
+ .TP 15