update to 2.1.2HEADmaster

drop patch merged upstream

4 files changed, 16 insertions, 31 deletions

diff --git a/1849.patch b/1849.patch
deleted file mode 100644
index 3fbc037..0000000
--- a/1849.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4f0549efca593cc6243846cbb1d2d5ba28f3c6fb Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 17 Jul 2025 09:20:28 +0200
-Subject: [PATCH] use ZSTR_IS_INTERNED()
-
----
- src/contrib/php_array_api.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/contrib/php_array_api.h b/src/contrib/php_array_api.h
-index 5a973375a..5e88c5c74 100644
---- a/src/contrib/php_array_api.h
-+++ b/src/contrib/php_array_api.h
-@@ -350,7 +350,7 @@ char *php_array_zval_to_string(zval *z, int *plen, zend_bool *pfree) {
- 			zval c = *z;
- 			zval_copy_ctor(&c);
- 			convert_to_string(&c);
--			*pfree = ! IS_INTERNED(Z_STR(c));
-+			*pfree = ! ZSTR_IS_INTERNED(Z_STR(c));
- 			*plen = Z_STRLEN(c);
- 			return Z_STRVAL(c);
- 		}
diff --git a/PHPINFO b/PHPINFO
index 1d204ae..499a7e3 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 mongodb
 
 MongoDB support => enabled
-MongoDB extension version => 2.1.1
+MongoDB extension version => 2.1.2
 MongoDB extension stability => stable
 libbson bundled version => 1.30.5
 libmongoc bundled version => 1.30.5
diff --git a/REFLECTION b/REFLECTION
index c8e7b8e..81ee001 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #132 mongodb version 2.1.1 ] {
+Extension [ <persistent> extension #140 mongodb version 2.1.2 ] {
 
   - Dependencies {
     Dependency [ date (Required) ]
@@ -14,7 +14,7 @@ Extension [ <persistent> extension #132 mongodb version 2.1.1 ] {
   }
 
   - Constants [2] {
-    Constant [ string MONGODB_VERSION ] { 2.1.1 }
+    Constant [ string MONGODB_VERSION ] { 2.1.2 }
     Constant [ string MONGODB_STABILITY ] { stable }
   }
 
diff --git a/php-pecl-mongodb2.spec b/php-pecl-mongodb2.spec
index 819c3cf..403218b 100644
--- a/php-pecl-mongodb2.spec
+++ b/php-pecl-mongodb2.spec
@@ -37,13 +37,13 @@
 
 Summary:        MongoDB driver for PHP version 2
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}2
-%global upstream_version 2.1.1
+%global upstream_version 2.1.2
 #global upstream_prever  beta1
 #global upstream_lower   ~beta1
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
 Version:        %{upstream_version}%{?upstream_lower}
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %if %{with syslib}
 License:        Apache-2.0
 %else
@@ -52,8 +52,6 @@ License:        Apache-2.0 AND ISC AND MIT AND Zlib AND BSD-3-Clause
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Patch0:         1849.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.1
@@ -87,15 +85,19 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-json%{?_isa}
 
+# PECL
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})           = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa}   = %{version}
+# PIE
 Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
 Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj}      = %{version}
 
 %if 0%{?fedora} >= 43 || 0%{?rhel} >= 11 || "%{php_version}" > "8.5"
+# previously was the pure-PHP library, now only the extension
 Obsoletes:      %{?scl_prefix}php-%{pecl_name}                 < 2
 Provides:       %{?scl_prefix}php-%{pecl_name}                 = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}         = %{version}
+# old version
 Obsoletes:      %{?scl_prefix}php-pecl-%{pecl_name}            < 2
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}            = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}    = %{version}-%{release}
@@ -123,8 +125,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 pushd %{sources}
-%patch -P0 -p1
-
 # Check our macro values
 cat src/*_VERSION_CURRENT
 grep -q %{bundled_libmongo} src/LIBMONGOC_VERSION_CURRENT
@@ -264,6 +264,13 @@ OPT="-n"
 
 
 %changelog
+* Thu Oct  2 2025 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+- drop patch merged upstream
+
+* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 2.1.1-4
+- rebuild for PHP 8.5.0RC1
+
 * Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 2.1.1-3
 - rebuild for 8.5.0alpha3