From d7a3e25dd607e34daf92edc9769cdc7b9a3db515 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Jul 2017 06:58:53 +0200 Subject: more upstream patch --- php-pecl-memcached.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 915a72f..0bd5a4a 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -27,7 +27,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.0.3 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -35,6 +35,7 @@ URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: 43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch +Patch1: 39bfab06c0c27dc620486f56a926308df5d4c819.patch BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -137,6 +138,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS %patch0 -p1 -b .upstream +%patch1 -p1 -b .upstream %if %{with_fastlz} rm -r fastlz @@ -286,11 +288,6 @@ OPT="-n" %if %{with_tests} # XFAIL and very slow so no value rm ?TS/tests/expire.phpt -%if "%{php_version}" > "7.2" -# https://github.com/php-memcached-dev/php-memcached/issues/358 -# only additional message -rm ?TS/tests/session_badconf_servers.phpt -%endif ret=0 @@ -345,6 +342,9 @@ exit $ret %changelog +* Wed Jul 12 2017 Remi Collet - 3.0.3-4 +- add upstream patch (tests) for PHP 7.2 + * Sun Jul 9 2017 Remi Collet - 3.0.3-3 - add upstream patch (tests) for PHP 7.2 -- cgit