diff options
Diffstat (limited to 'php-pecl-memcached.spec')
| -rw-r--r-- | php-pecl-memcached.spec | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 288a3a2..614c0d0 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-memcached # -# Copyright (c) 2009-2020 Remi Collet +# Copyright (c) 2009-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -31,7 +31,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.1.5 -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 URL: https://pecl.php.net/package/%{pecl_name} @@ -39,6 +39,12 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/461.patch Patch1: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/463.patch +Patch2: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/465.patch +Patch3: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/467.patch +Patch4: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/468.patch +Patch5: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/469.patch +Patch6: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/472.patch +Patch7: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/473.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 @@ -58,7 +64,7 @@ BuildRequires: memcached %endif BuildRequires: pkgconfig(libevent) >= 2.0.2 -%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 %global move_to_opt 1 BuildRequires: libmemcached-opt-devel >= 1.0.18 Requires: fastlz%{?_isa} @@ -119,10 +125,6 @@ Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%endif %if %{move_to_opt} %{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so$} %endif @@ -155,6 +157,12 @@ cd NTS %if "%{php_version}" > "8.0" %patch0 -p1 -b .pr461 %patch1 -p1 -b .pr463 +%patch2 -p1 -b .pr465 +%patch3 -p1 -b .pr467 +%patch4 -p1 -b .pr468 +%patch5 -p1 -b .pr469 +%patch6 -p1 -b .pr472 +%patch7 -p1 -b .pr473 %endif %if %{with_fastlz} @@ -355,6 +363,15 @@ exit $ret %changelog * Thu Oct 8 2020 Remi Collet <remi@remirepo.net> - 3.1.5-3 +- more patches for PHP 8 from + https://github.com/php-memcached-dev/php-memcached/pull/465 + https://github.com/php-memcached-dev/php-memcached/pull/467 + https://github.com/php-memcached-dev/php-memcached/pull/468 + https://github.com/php-memcached-dev/php-memcached/pull/469 + https://github.com/php-memcached-dev/php-memcached/pull/472 + https://github.com/php-memcached-dev/php-memcached/pull/473 + +* Thu Oct 8 2020 Remi Collet <remi@remirepo.net> - 3.1.5-3 - add patches for PHP 8 from https://github.com/php-memcached-dev/php-memcached/pull/461 https://github.com/php-memcached-dev/php-memcached/pull/463 |