From 02ae0051a6fd03737e887334b47e88cff5acdbb4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 24 Jun 2025 16:00:36 +0200
Subject: add upstream patch for redis 8

use valkey by default for tests
---
 php-pecl-redis6.spec | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'php-pecl-redis6.spec')

diff --git a/php-pecl-redis6.spec b/php-pecl-redis6.spec
index 198cc05..5de3bc6 100644
--- a/php-pecl-redis6.spec
+++ b/php-pecl-redis6.spec
@@ -16,13 +16,9 @@
 %endif
 %bcond_without       igbinary
 %bcond_without       msgpack
-%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
-%bcond_without       valkey
-%else
-# Use valkey instead of redis for tests
-%bcond_with          valkey
-%endif
-# Use keydb instead of redis for tests
+# use redis instead of valkey for tests
+%bcond_with          redis
+# Use keydb instead of valkey for tests
 %bcond_with          keydb
 
 %global pie_vend     phpredis
@@ -40,11 +36,13 @@
 Summary:       PHP extension for interfacing with key-value stores
 Name:          %{?scl_prefix}php-pecl-redis6
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP-3.01
 URL:           https://pecl.php.net/package/redis
 Source0:       https://pecl.php.net/get/%{sources}.tgz
 
+Patch0:        redis-8.0.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.4
@@ -61,13 +59,13 @@ BuildRequires: pkgconfig(libzstd) >= 1.3.0
 BuildRequires: pkgconfig(liblz4)
 # to run Test suite
 %if %{with tests}
-%if %{with valkey}
-BuildRequires: valkey
+%if %{with redis}
+BuildRequires: redis
 %else
 %if %{with keydb}
 BuildRequires: keydb
 %else
-BuildRequires: redis
+BuildRequires: valkey
 %endif
 %endif
 %endif
@@ -129,6 +127,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1
+
 # Use system library
 rm -r liblzf
 
@@ -278,18 +278,16 @@ done
 %if %{with tests}
 cd %{sources}/tests
 
-: Launch redis server
-%if %{with valkey}
+: Launch the server
 SRV=%{_root_bindir}/valkey-server
 CLI=%{_root_bindir}/valkey-cli
-%else
-%if %{with keydb}
-SRV=%{_root_bindir}/keydb-server
-CLI=%{_root_bindir}/keydb-cli
-%else
+%if %{with redis}
 SRV=%{_root_bindir}/redis-server
 CLI=%{_root_bindir}/redis-cli
 %endif
+%if %{with keydb}
+SRV=%{_root_bindir}/keydb-server
+CLI=%{_root_bindir}/keydb-cli
 %endif
 
 mkdir -p data
@@ -341,6 +339,10 @@ exit $ret
 
 
 %changelog
+* Tue Jun 24 2025 Remi Collet <remi@remirepo.net> - 6.2.0-2
+- add upstream patch for redis 8
+- use valkey by default for tests
+
 * Tue Mar 25 2025 Remi Collet <remi@remirepo.net> - 6.2.0-1
 - update to 6.2.0
 
-- 
cgit