From 31df1d7dc32821ee15a80e1392dc0939dc3b7b67 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Sep 2020 13:10:19 +0200 Subject: enable msgpack serializer with PHP 8 --- php-pecl-redis5.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/php-pecl-redis5.spec b/php-pecl-redis5.spec index e6f5389..848080d 100644 --- a/php-pecl-redis5.spec +++ b/php-pecl-redis5.spec @@ -21,13 +21,7 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %bcond_without tests %bcond_without igbinary -# NOTICE: this only work when php-devel in buildroot (so only for SCL) -# use mock... --without msgpack for base package -%if "%{php_version}" > "8.0" -%bcond_with msgpack -%else %bcond_without msgpack -%endif # after 20-json, 40-igbinary and 40-msgpack %global ini_name 50-%{pecl_name}.ini @@ -37,7 +31,7 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?sub_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;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/redis Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz @@ -66,10 +60,10 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} %if %{with igbinary} -Requires: %{?scl_prefix}php-pecl(igbinary)%{?_isa} +Requires: %{?scl_prefix}php-igbinary%{?_isa} %endif %if %{with msgpack} -Requires: %{?scl_prefix}php-pecl-msgpack%{?_isa} +Requires: %{?scl_prefix}php-msgpack%{?_isa} %endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} @@ -365,6 +359,9 @@ fi %changelog +* Wed Sep 23 2020 Remi Collet - 5.3.1-3 +- enable msgpack serializer with PHP 8 + * Fri Sep 11 2020 Remi Collet - 5.3.1-2 - add patches for PHP 8 from upstream and https://github.com/phpredis/phpredis/pull/1845 -- cgit