From 36c45d780ded7574689791be02a5d0d89c9434f3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Mar 2021 08:31:32 +0100
Subject: update to 3.1.1 raise dependency on libcouchbase 3.1

---
 PHPINFO                  |  6 +++---
 REFLECTION               |  7 ++++---
 php-pecl-couchbase3.spec | 10 ++++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index b8e1ac8..4e9f4a6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,9 +2,9 @@
 couchbase
 
 couchbase support => enabled
-extension version => 3.1.0
-libcouchbase runtime version => 3.0.7 (git: d2d3666e269b41413408aaae96eb289f1cb4f8ec)
-libcouchbase headers version => 3.0.7 (git: d2d3666e269b41413408aaae96eb289f1cb4f8ec)
+extension version => 3.1.1
+libcouchbase runtime version => 3.1.0 (git: ed8b57e731e04e2749393c8bed8f9eb88d5d663d)
+libcouchbase headers version => 3.1.0 (git: ed8b57e731e04e2749393c8bed8f9eb88d5d663d)
 zlib compressor => enabled
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index ddc4d4c..777652c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #119 couchbase version 3.1.0 ] {
+Extension [ <persistent> extension #119 couchbase version 3.1.1 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -31,7 +31,7 @@ Extension [ <persistent> extension #119 couchbase version 3.1.0 ] {
     }
   }
 
-  - Constants [175] {
+  - Constants [176] {
     Constant [ int COUCHBASE_PERSISTTO_MASTER ] { 1 }
     Constant [ int COUCHBASE_PERSISTTO_ONE ] { 1 }
     Constant [ int COUCHBASE_PERSISTTO_TWO ] { 2 }
@@ -105,6 +105,7 @@ Extension [ <persistent> extension #119 couchbase version 3.1.0 ] {
     Constant [ int COUCHBASE_ERR_PLANNING_FAILURE ] { 401 }
     Constant [ int COUCHBASE_ERR_INDEX_FAILURE ] { 402 }
     Constant [ int COUCHBASE_ERR_PREPARED_STATEMENT_FAILURE ] { 403 }
+    Constant [ int COUCHBASE_ERR_KEYSPACE_NOT_FOUND ] { 404 }
     Constant [ int COUCHBASE_ERR_COMPILATION_FAILED ] { 501 }
     Constant [ int COUCHBASE_ERR_JOB_QUEUE_FULL ] { 502 }
     Constant [ int COUCHBASE_ERR_DATASET_NOT_FOUND ] { 503 }
@@ -9793,7 +9794,7 @@ Extension [ <persistent> extension #119 couchbase version 3.1.0 ] {
       }
 
       - Methods [5] {
-        Method [ <internal:couchbase> public method cas ] {
+        Method [ <internal, deprecated:couchbase> public method cas ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> string $arg ]
diff --git a/php-pecl-couchbase3.spec b/php-pecl-couchbase3.spec
index ae20989..10115cf 100644
--- a/php-pecl-couchbase3.spec
+++ b/php-pecl-couchbase3.spec
@@ -25,7 +25,7 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?sub_prefix}php-pecl-couchbase3
-Version:       3.1.0
+Version:       3.1.1
 Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP
 URL:           https://pecl.php.net/package/couchbase
@@ -35,11 +35,13 @@ Patch0:        https://patch-diff.githubusercontent.com/raw/couchbase/php-couchb
 
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
+# thanks to our patch (upstream requires 7.3)
 BuildRequires: %{?scl_prefix}php-devel >= 7.2
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-json
 BuildRequires: %{?scl_prefix}php-tokenizer
-BuildRequires: pkgconfig(libcouchbase) >= 3.0.0
+# ensure we use the latest version (upstream requires 3.0.0)
+BuildRequires: pkgconfig(libcouchbase) >= 3.1
 BuildRequires: fastlz-devel
 BuildRequires: zlib-devel
 
@@ -239,6 +241,10 @@ fi
 
 
 %changelog
+* Fri Mar  5 2021 Remi Collet <remi@remirepo.net> - 3.1.1-1
+- update to 3.1.1
+- raise dependency on libcouchbase 3.1
+
 * Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 3.1.0-1
 - update to 3.1.0
 
-- 
cgit