From ca9cc1dd109ed589e3eaa6c03af135da1fad0fbb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Mar 2023 10:23:42 +0100 Subject: add patch for test suite with redis 7.2 from https://github.com/phpredis/phpredis/pull/2335 --- php-pecl-redis5.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'php-pecl-redis5.spec') diff --git a/php-pecl-redis5.spec b/php-pecl-redis5.spec index dd04480..0bd2289 100644 --- a/php-pecl-redis5.spec +++ b/php-pecl-redis5.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-pecl-redis5 # -# Copyright (c) 2012-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2012-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -30,11 +30,13 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?scl_prefix}php-pecl-redis5 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: PHP +Release: 3%{?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/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: %{pecl_name}-tests.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -84,7 +86,7 @@ Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 5 Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}4 < 5 %endif -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7 # Other third party repo stuff %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} @@ -133,6 +135,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b.pr2335 + # Use system library rm -r liblzf @@ -353,6 +357,10 @@ fi %changelog +* Thu Mar 23 2023 Remi Collet - 5.3.7-3 +- add patch for test suite with redis 7.2 from + https://github.com/phpredis/phpredis/pull/2335 + * Fri Sep 9 2022 Remi Collet - 5.3.7-2 - rebuild for PHP 8.2 with msgpack and igbinary -- cgit