From 9d6ea69cd247783acf249ac1f0c212b1a39ead20 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Dec 2018 17:06:42 +0100 Subject: test build for upstream patch --- php-pecl-redis4.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'php-pecl-redis4.spec') diff --git a/php-pecl-redis4.spec b/php-pecl-redis4.spec index 33fbbcc..0d433bc 100644 --- a/php-pecl-redis4.spec +++ b/php-pecl-redis4.spec @@ -34,11 +34,13 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?sub_prefix}php-pecl-redis4 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;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz License: PHP URL: http://pecl.php.net/package/redis +Patch0: https://github.com/phpredis/phpredis/commit/7b8b7b01a2b2af2e646ca89802910ac216c476dc.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -127,6 +129,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 + # Use system library rm -r liblzf @@ -272,7 +276,7 @@ port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + P # https://github.com/phpredis/phpredis/issues/1472 -sed -e 's/testXClaim/skipXClaim/;s/testXAck/skipXAck/;s/testXReadGroup/skipXReadGroup/' -i RedisTest.php +#sed -e 's/testXClaim/skipXClaim/;s/testXAck/skipXAck/;s/testXReadGroup/skipXReadGroup/' -i RedisTest.php : Run the test Suite sed -e "s/6379/$port/" -i *.php @@ -333,6 +337,9 @@ fi %changelog +* Tue Dec 11 2018 Remi Collet - 4.2.0-3 +- test build for upstream patch + * Tue Dec 4 2018 Remi Collet - 4.2.0-2 - open https://github.com/phpredis/phpredis/issues/1472 tests failing with redis 5.0.2 -- cgit