From ca8ec10e624800bc4504936604e8b0994d9cbb06 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Nov 2020 11:19:52 +0100 Subject: add patch for PHP 8 from https://github.com/couchbase/php-couchbase/pull/31 open https://github.com/couchbase/php-couchbase/pull/30 min PHP version open https://github.com/couchbase/php-couchbase/pull/29 pkg-config --- php-pecl-couchbase3.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'php-pecl-couchbase3.spec') diff --git a/php-pecl-couchbase3.spec b/php-pecl-couchbase3.spec index 16c1e71..76a95c8 100644 --- a/php-pecl-couchbase3.spec +++ b/php-pecl-couchbase3.spec @@ -26,13 +26,15 @@ Summary: Couchbase Server PHP extension Name: %{?sub_prefix}php-pecl-couchbase3 Version: 3.0.4 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/couchbase Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/couchbase/php-couchbase/pull/31.patch + BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7.1 +BuildRequires: %{?scl_prefix}php-devel >= 7.2 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-tokenizer @@ -107,6 +109,10 @@ mv %{pecl_name}-%{version}%{?prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%if "%{php_version}" > "8.0" +%patch0 -p1 -b .pr31 +%endif + # Drop bundled library sed -e '/fastlz/d' -i ../package.xml rm -r fastlz @@ -240,6 +246,12 @@ fi %changelog +* Fri Nov 13 2020 Remi Collet - 3.0.4-2 +- add patch for PHP 8 from + https://github.com/couchbase/php-couchbase/pull/31 +- open https://github.com/couchbase/php-couchbase/pull/30 min PHP version +- open https://github.com/couchbase/php-couchbase/pull/29 pkg-config + * Thu Nov 12 2020 Remi Collet - 3.0.4-1 - update to 3.0.4 - rename to php-pecl-couchbase3 -- cgit