summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-07-09 19:00:07 +0200
committerRemi Collet <remi@remirepo.net>2017-07-09 19:00:07 +0200
commitf16738a68f31187aa04b09f887a20f17f13d1de0 (patch)
tree0d156d2a593ba92ca619b301d291391080a73e20
parenta4df046b2ea6e5c9069815f7d012d725fcafd92d (diff)
upstream patch for 7.2
-rw-r--r--php-pecl-memcached.spec17
1 files changed, 16 insertions, 1 deletions
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index d4b3e54..915a72f 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -27,13 +27,15 @@
Summary: Extension to work with the Memcached caching daemon
Name: %{?sub_prefix}php-pecl-memcached
Version: 3.0.3
-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
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Patch0: 43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch
+
BuildRequires: %{?scl_prefix}php-devel >= 7
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-json
@@ -98,6 +100,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.2"
+Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -130,6 +136,7 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1 -b .upstream
%if %{with_fastlz}
rm -r fastlz
@@ -279,6 +286,11 @@ 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
@@ -333,6 +345,9 @@ exit $ret
%changelog
+* Sun Jul 9 2017 Remi Collet <remi@remirepo.net> - 3.0.3-3
+- add upstream patch (tests) for PHP 7.2
+
* Fri Apr 14 2017 Remi Collet <remi@fedoraproject.org> - 3.0.3-2
- ensure we use libevent2 on EL-6