diff options
Diffstat (limited to 'php-pecl-memcached.spec')
| -rw-r--r-- | php-pecl-memcached.spec | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index cb23fe6..38c0f35 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -33,7 +33,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.1.5 -Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/%{pecl_name} @@ -50,6 +50,7 @@ Patch7: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php Patch8: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/486.patch Patch9: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/487.patch Patch10: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/488.patch +Patch11: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/474.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 @@ -71,7 +72,7 @@ BuildRequires: memcached %endif BuildRequires: pkgconfig(libevent) >= 2.0.2 -%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +%if 0%{?rhel} %global move_to_opt 1 BuildRequires: %{?vendeur:%{vendeur}-}libmemcached-awesome-devel >= 1.1 Requires: libevent%{?_isa} @@ -176,11 +177,15 @@ cd NTS %patch4 -p1 -b .pr468 %patch5 -p1 -b .pr469 %patch6 -p1 -b .pr472 -%patch7 -p1 -b .pr473 %patch8 -p1 -b .pr486 %patch9 -p1 -b .pr486 %endif %patch10 -p1 -b .pr488 +%if "%{php_version}" > "8.0" +%patch11 -p1 -b .pr474 +%else +%patch7 -p1 -b .pr473 +%endif %if %{with fastlz} rm -r fastlz @@ -381,6 +386,10 @@ exit $ret %changelog +* Fri Nov 5 2021 Remi Collet <remi@remirepo.net> - 3.1.5-12 +- add patch for MemcachedServer from + https://github.com/php-memcached-dev/php-memcached/pull/474 + * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 3.1.5-11 - rebuild for 8.1.0RC1 |