From 3275e985d2b4216728dce7d770c9578c25c18572 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 12:13:50 +0200 Subject: add upstream patch for PHP 7.3 --- php-pecl-memcached.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'php-pecl-memcached.spec') diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 426c25f..5c890c5 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -31,14 +31,16 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.0.4 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: %{pecl_name}-pr330.patch +Patch0: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/330.patch +Patch1: https://github.com/php-memcached-dev/php-memcached/commit/8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json @@ -134,6 +136,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS %patch0 -p1 -b .pr330 +%patch1 -p1 -b .up %if %{with_fastlz} rm -r fastlz @@ -242,7 +245,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -337,6 +340,9 @@ exit $ret %changelog +* Thu Jun 28 2018 Remi Collet - 3.0.4-5 +- add upstream patch for PHP 7.3 + * Tue Feb 27 2018 Remi Collet - 3.0.4-4 - bump release -- cgit