diff options
| -rw-r--r-- | 88.patch | 23 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 19 | ||||
| -rw-r--r-- | php-pecl-solr2.spec | 14 |
4 files changed, 18 insertions, 42 deletions
diff --git a/88.patch b/88.patch deleted file mode 100644 index 7ff51ab..0000000 --- a/88.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 53db37e10f28261844ac9e82493b3a9e0b20e7e8 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 18 Jul 2025 09:46:45 +0200 -Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() - for 8.5 - ---- - src/php_solr.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/php_solr.h b/src/php_solr.h -index 278182f9..d7511a14 100644 ---- a/src/php_solr.h -+++ b/src/php_solr.h -@@ -126,7 +126,7 @@ extern ZEND_API zend_class_entry *zend_ce_iterator; - #define solr_ce_Serializable zend_ce_serializable - #define solr_ce_ArrayAccess zend_ce_arrayaccess - #define solr_ce_Iterator zend_ce_iterator --#define solr_ce_Exception zend_exception_get_default() -+#define solr_ce_Exception zend_ce_exception - /* }}} */ - - extern zend_object_handlers solr_object_handlers; @@ -2,6 +2,6 @@ solr Solr Support => enabled -Version => 2.8.1 -Last Build Date => Apr 23 2025 +Version => 2.9.1 +Last Build Date => Nov 25 2025 Last Build Time => 00:00:00 @@ -1,15 +1,14 @@ -Extension [ <persistent> extension #135 solr version 2.8.1 ] { +Extension [ <persistent> extension #147 solr version 2.9.1 ] { - Dependencies { - Dependency [ libxml (Required) ] Dependency [ json (Required) ] } - Constants [4] { Constant [ int SOLR_MAJOR_VERSION ] { 2 } - Constant [ int SOLR_MINOR_VERSION ] { 8 } + Constant [ int SOLR_MINOR_VERSION ] { 9 } Constant [ int SOLR_PATCH_VERSION ] { 1 } - Constant [ string SOLR_EXTENSION_VERSION ] { 2.8.1 } + Constant [ string SOLR_EXTENSION_VERSION ] { 2.9.1 } } - Functions { @@ -5023,7 +5022,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5124,7 +5123,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5225,7 +5224,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5326,7 +5325,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5427,7 +5426,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5528,7 +5527,7 @@ Extension [ <persistent> extension #135 solr version 2.8.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.1-build/php-pecl-solr2-2.8.1/solr-2.8.1/src/solr_functions_helpers.c' ] + Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.1-build/php-pecl-solr2-2.9.1/solr-2.9.1/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index b22b7f6..41c6eb4 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -31,19 +31,17 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr2 -Version: 2.8.1 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.9.1 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 Group: Development/Languages URL: https://pecl.php.net/package/solr Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: 88.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7.4 +BuildRequires: (%{?scl_prefix}php-devel >= 7.4 with %{?scl_prefix}php-devel < 8.6) BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -101,8 +99,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 - : Check version extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' src/php_solr_version.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -218,6 +214,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Nov 25 2025 Remi Collet <remi@remirepo.net> - 2.9.1-1 +- update to 2.9.1 +- drop patch merged upstream + * Thu Nov 20 2025 Remi Collet <remi@remirepo.net> - 2.8.1-3 - add pie virtual provides |
