From d21d9f2894a9cc066b96045e314cf3b4ebc22f52 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Oct 2022 12:02:46 +0200 Subject: add patch for PHP 8.2 from https://github.com/websupport-sk/pecl-memcache/pull/104 --- php-pecl-memcache.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'php-pecl-memcache.spec') diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index aaa1ff5..a26509a 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -1,6 +1,6 @@ # spec file for php-pecl-memcache # -# Copyright (c) 2007-2021 Remi Collet +# Copyright (c) 2007-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,12 +21,13 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcache Version: 8.0 -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;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} Patch0: %{pecl_name}-php81.patch +Patch1: %{pecl_name}-php82.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -100,6 +101,7 @@ sed -e 's/role="test"/role="src"/' \ pushd NTS %patch0 -p1 +%patch1 -p1 sed -e '/PHP_MEMCACHE_VERSION/s/4.0.5.2/%{version}/' -i src/php_memcache.h @@ -221,8 +223,13 @@ done %endif %if %{with tests} -: Configuration for tests cd NTS +: ignore test with erratic results +rm tests/040.phpt +rm tests/056.phpt +rm tests/100c.phpt + +: Configuration for tests sed -e "s:/var/run/memcached/memcached.sock:$PWD/memcached.sock:" \ -i tests/connect.inc @@ -283,6 +290,10 @@ fi %changelog +* Wed Oct 5 2022 Remi Collet - 8.0-4 +- add patch for PHP 8.2 from + https://github.com/websupport-sk/pecl-memcache/pull/104 + * Wed Sep 01 2021 Remi Collet - 8.0-3 - rebuild for 8.1.0RC1 -- cgit