From 3d677a7569bb1cb2b037abf6b804bef983fc6c5f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 23 Jan 2023 15:34:17 +0100
Subject: update to 4.1.0

drop patch merged upstream
---
 php-pecl-couchbase4.spec | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

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

diff --git a/php-pecl-couchbase4.spec b/php-pecl-couchbase4.spec
index cc7a160..1955899 100644
--- a/php-pecl-couchbase4.spec
+++ b/php-pecl-couchbase4.spec
@@ -1,7 +1,7 @@
 # remirepo spec file for php-pecl-couchbase4
 #
-# Copyright (c) 2013-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -26,16 +26,17 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?scl_prefix}php-pecl-couchbase4
-Version:       4.0.0
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-# ASL 2.0
+Version:       4.1.0
+Release:       1%{?dist}
+# Apache-2.0
 # src
 # third_party/json/LICENSE.ryu
-## BSD
+## BSD-3-Clause
 # third_party/snappy/COPYING
+# third_party/json/LICENSE.double-conversion
+## BSD-2-Clause
 # third_party/hdr_histogram_c/LICENSE.txt
 # third_party/hdr_histogram_c/COPYING.txt
-# third_party/json/LICENSE.double-conversion
 ## MIT
 # third_party/fmt/LICENSE.rst
 # third_party/gsl/LICENSE
@@ -45,12 +46,10 @@ Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_V
 # third_party/json/LICENSE.itoa
 # third_party/jsonsl/LICENSE
 # third_party/spdlog/LICENSE
-License:       ASL 2.0 and BSD and MIT
+License:       Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT
 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/couchbase-php-client/pull/32.patch
-
 BuildRequires: make
 %if 0%{?rhel} == 7
 BuildRequires: cmake3 >= 3.17
@@ -118,7 +117,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c
 mv %{pecl_name}-%{version}%{?prever} NTS
 
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
+%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/;/COPYING/s/role="doc"/role="src"/' -i package.xml}
 
 mkdir lic
 cp NTS/src/deps/couchbase-cxx-client/third_party/hdr_histogram_c/COPYING.txt    lic/hdr_histogram_c_COPYING.txt
@@ -137,7 +136,6 @@ cp NTS/src/deps/couchbase-cxx-client/third_party/spdlog/LICENSE
 cp NTS/src/deps/couchbase-cxx-client/LICENSE.txt                                lic/LICENSE.txt
 
 cd NTS
-%patch0 -p1
 %if 0%{?rhel} == 7
 sed -e 's/cmake/cmake3/' -i config.m4
 %endif
@@ -158,6 +156,9 @@ extension=%{pecl_name}.so
 ;couchbase.max_persistent = 1
 ;couchbase.persistent_timeout = -1
 ;couchbase.log_level =
+;couchbase.log_php_log_err = 1
+;couchbase.log_stderr = 0
+;couchbase.log_path =
 EOF
 
 %if 0%{?__ztsphp:1}
@@ -257,17 +258,21 @@ fi
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
-%{php_extdir}/libcouchbase_php_core.so
+%{php_extdir}/libcouchbase_php_wrapper.so
 
 %if %{with_zts}
 %config(noreplace) %{php_ztsinidir}/%{ini_name}
 %{php_ztsextdir}/%{pecl_name}.so
-%{php_ztsextdir}/libcouchbase_php_core.so
+%{php_ztsextdir}/libcouchbase_php_wrapper.so
 %endif
 
 
 
 %changelog
+* Mon Jan 23 2023 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+- drop patch merged upstream
+
 * Wed May 11 2022 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - update to 4.0.0
 - drop dependency on libcouchbase
-- 
cgit