From 2e5096e3366e1b2a55f83572f74305e38d5f6202 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 7 Dec 2020 08:23:32 +0100
Subject: update to 3.0.5 drop patches merged upstream add patch for PHP 7.2
 from   https://github.com/couchbase/php-couchbase/pull/32

---
 php-pecl-couchbase3.spec | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'php-pecl-couchbase3.spec')

diff --git a/php-pecl-couchbase3.spec b/php-pecl-couchbase3.spec
index fac73d2..b044e1c 100644
--- a/php-pecl-couchbase3.spec
+++ b/php-pecl-couchbase3.spec
@@ -25,13 +25,13 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?sub_prefix}php-pecl-couchbase3
-Version:       3.0.4
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       3.0.5
+Release:       1%{?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
+Patch0:        https://patch-diff.githubusercontent.com/raw/couchbase/php-couchbase/pull/32.patch
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.2
@@ -84,12 +84,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$}
-%{?filter_setup}
-%endif
-
 
 %description
 The PHP client library provides fast access to documents stored
@@ -108,9 +102,7 @@ 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
+%patch0 -p1 -b .pr32
 
 # Drop bundled library
 sed -e '/fastlz/d' -i ../package.xml
@@ -198,7 +190,7 @@ done
    -d extension=tokenizer.so \
    -d extension=json.so \
    -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-   -m | grep %{pecl_name}
+   -m | grep '^%{pecl_name}$'
 
 %if %{with_zts}
 : minimal ZTS load test
@@ -206,7 +198,7 @@ done
    -d extension=tokenizer.so \
    -d extension=json.so \
    -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-   -m | grep %{pecl_name}
+   -m | grep '^%{pecl_name}$'
 %endif
 
 
@@ -245,6 +237,12 @@ fi
 
 
 %changelog
+* Mon Dec  7 2020 Remi Collet <remi@remirepo.net> - 3.0.5-1
+- update to 3.0.5
+- drop patches merged upstream
+- add patch for PHP 7.2 from
+  https://github.com/couchbase/php-couchbase/pull/32
+
 * Fri Nov 13 2020 Remi Collet <remi@remirepo.net> - 3.0.4-2
 - add patch for PHP 8 from
   https://github.com/couchbase/php-couchbase/pull/31
-- 
cgit