From df786883ffe7639c721f15af92a83439bc34ac3f Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 26 Sep 2017 14:58:36 +1000 Subject: [PATCH] Latest upstream bugfix release and some packaging BZ fixes --- .gitignore | 1 + ...-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch | 4 ++-- ...tall-redis-check-rdb-as-a-symlink-instead-of-dupl.patch | 6 +++--- redis.spec | 7 ++++--- sources | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f2122e6..2a09209 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /redis-3.2.8.tar.gz /redis-3.2.9.tar.gz /redis-3.2.10.tar.gz +/redis-3.2.11.tar.gz diff --git a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch index 843dfb4..ab62c0c 100644 --- a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +++ b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -1,4 +1,4 @@ -From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001 +From c7958ad1c0d615b81276ec2d4dbc1bf6a67dcc4d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2016 14:51:15 +0200 Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - @@ -648,5 +648,5 @@ index 0000000..1e0c9c9 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- -2.9.3 +2.13.5 diff --git a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch index 4c4181a..75448ba 100644 --- a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +++ b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch @@ -1,4 +1,4 @@ -From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001 +From 992c773e70462a6fbe1536e18e673c9ab55d5901 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Sep 2016 17:23:27 +0200 Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of @@ -9,7 +9,7 @@ Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 6c27dd9..2de5e3f 100644 +index fdbe36a..c3083f8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -267,6 +267,6 @@ install: all @@ -21,5 +21,5 @@ index 6c27dd9..2de5e3f 100644 @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) -- -2.9.3 +2.13.5 diff --git a/redis.spec b/redis.spec index 3687968..f223225 100644 --- a/redis.spec +++ b/redis.spec @@ -17,8 +17,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 3.2.10 -Release: 3%{?dist} +Version: 3.2.11 +Release: 1%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -288,7 +288,8 @@ fi %changelog -* Wed Sep 06 2017 Nathan Scott - 3.2.10-3 +* Tue Sep 26 2017 Nathan Scott - 3.2.11-1 +- Upstream 3.2.11 bug-fix-only release - Switch to using Type=notify for Redis systemd services (RHBZ #1172841) - Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500) diff --git a/sources b/sources index 40c7ebf..9d2d41c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (redis-3.2.10.tar.gz) = 32fd27fac8ba559ea38e3a1006b90c4117c74a8ca15399ade19834c4221521e7e3669e4e1f24d214a53bb7cde896839438dd4a273d6be6def587841dd9954aa1 +SHA512 (redis-3.2.11.tar.gz) = 3eab216350828ef78e7e9e28ac2fff3ea89d9eb7f86a66c4788667cde7c966bce7dda03470c2baacf2dce63496685e11ca2ef0a82b5fbbd20fb8e449146a20ee