rebuildHEADmaster

3 files changed, 15 insertions, 21 deletions

diff --git a/PHPINFO b/PHPINFO
index e288ece..f64f5ec 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ couchbase
 
 couchbase support => enabled
 extension version => 2.6.2
-libcouchbase runtime version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98)
-libcouchbase headers version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98)
+libcouchbase runtime version => 2.10.9 (git: c9159206da3047777b97df7a54e3190fd2bc6cc2)
+libcouchbase headers version => 2.10.6 (git: 61e274aae48b6edeecb081afec843dbe31d72790)
 igbinary transcoder => enabled
 zlib compressor => enabled
 
diff --git a/REFLECTION b/REFLECTION
index 5ac6f96..d14d872 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #109 couchbase version 2.6.2 ] {
+Extension [ <persistent> extension #147 couchbase version 2.6.2 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
diff --git a/php-pecl-couchbase2.spec b/php-pecl-couchbase2.spec
index d479323..dac7785 100644
--- a/php-pecl-couchbase2.spec
+++ b/php-pecl-couchbase2.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-couchbase2
 #
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -26,18 +26,19 @@
 Summary:       Couchbase Server PHP extension
 Name:          %{?sub_prefix}php-pecl-couchbase2
 Version:       2.6.2
-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
 
+BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 5.6
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-pecl-igbinary-devel
 BuildRequires: %{?scl_prefix}php-json
 BuildRequires: %{?scl_prefix}php-tokenizer
-BuildRequires: pkgconfig(libcouchbase) >= 2.10.5
+BuildRequires: pkgconfig(libcouchbase) < 3
 BuildRequires: fastlz-devel
 BuildRequires: zlib-devel
 
@@ -46,7 +47,6 @@ Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 Requires:      %{?scl_prefix}php-json%{?_isa}
 Requires:      %{?scl_prefix}php-igbinary%{?_isa}
 Requires:      %{?scl_prefix}php-tokenizer%{?_isa}
-Requires:      libcouchbase%{?_isa} >= %{libbuildver}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:      %{?scl_prefix}php-%{pecl_name}               = %{version}
@@ -57,7 +57,7 @@ Provides:      %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}2         = %{version}-%{release}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release}
 %endif
-%if "%{php_version}" > "7.0"
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || "%{php_version}" > "7.0"
 Obsoletes:     %{?scl_prefix}php-pecl-couchbase         < 2
 Provides:      %{?scl_prefix}php-pecl-couchbase         = %{version}
 Provides:      %{?scl_prefix}php-pecl-couchbase%{?_isa} = %{version}
@@ -66,28 +66,19 @@ Provides:      %{?scl_prefix}php-pecl-couchbase%{?_isa} = %{version}
 Conflicts:     %{?scl_prefix}php-pecl-couchbase < 2
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 %if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name}2 <= %{version}
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.3"
-Obsoletes:     php73-pecl-%{pecl_name}2  <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name}2 <= %{version}
+Obsoletes:      php73-pecl-%{pecl_name}  <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{pecl_name}2  <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name}2 <= %{version}
+Obsoletes:      php74-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
@@ -240,6 +231,9 @@ fi
 
 
 %changelog
+* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 2.6.2-2
+- rebuild
+
 * Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 2.6.2-1
 - update to 2.6.2