diff options
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 22 | ||||
| -rw-r--r-- | composer.json | 27 | ||||
| -rw-r--r-- | php-pecl-solr2.spec | 68 |
4 files changed, 69 insertions, 52 deletions
@@ -2,6 +2,6 @@ solr Solr Support => enabled -Version => 2.9.1 -Last Build Date => Nov 25 2025 +Version => 2.9.3 +Last Build Date => Apr 14 2026 Last Build Time => 00:00:00 @@ -1,14 +1,14 @@ -Extension [ <persistent> extension #147 solr version 2.9.1 ] { +Extension [ <persistent> extension #150 solr version 2.9.3 ] { - Dependencies { Dependency [ json (Required) ] } - Constants [4] { - Constant [ int SOLR_MAJOR_VERSION ] { 2 } - Constant [ int SOLR_MINOR_VERSION ] { 9 } - Constant [ int SOLR_PATCH_VERSION ] { 1 } - Constant [ string SOLR_EXTENSION_VERSION ] { 2.9.1 } + Constant [ <persistent> int SOLR_MAJOR_VERSION ] { 2 } + Constant [ <persistent> int SOLR_MINOR_VERSION ] { 9 } + Constant [ <persistent> int SOLR_PATCH_VERSION ] { 3 } + Constant [ <persistent> string SOLR_EXTENSION_VERSION ] { 2.9.3 } } - Functions { @@ -5022,7 +5022,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5123,7 +5123,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5224,7 +5224,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5325,7 +5325,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5426,7 +5426,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } @@ -5527,7 +5527,7 @@ Extension [ <persistent> extension #147 solr version 2.9.1 ] { Property [ protected string $file = '' ] Property [ protected int $line = 0 ] Property [ protected $sourceline = 118 ] - 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 $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.9.3-build/pecl-search_engine-solr-2.9.3/src/solr_functions_helpers.c' ] Property [ protected $zif_name = 'solr_exception_register_class_properties' ] } diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..2ee67da --- /dev/null +++ b/composer.json @@ -0,0 +1,27 @@ +{ + "name": "pecl/solr", + "type": "php-ext", + "license": "PHP-3.01", + "description": "Apache Solr extension", + "require": { + "php": ">=7.4,<8.6", + "ext-json": "*" + }, + "php-ext": { + "extension-name": "solr", + "configure-options": [ + { + "name": "enable-solr", + "description": "Enable solr support" + }, + { + "name": "enable-solr-debug", + "description": "Compile with solr in verbose mode" + }, + { + "name": "enable-coverage", + "description": "Enable developer code coverage information" + } + ] + } +} diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 41c6eb4..b9925a6 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-solr2 # -# SPDX-FileCopyrightText: Copyright 2011-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2011-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -13,13 +13,18 @@ %global pecl_name solr %global pie_vend pecl -%global pie_proj solr +%global pie_proj %{pecl_name} #global prever b %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} # After 20-curl, 40-json %global ini_name 50-%{pecl_name}.ini -%global sources %{pecl_name}-%{version}%{?prever} -%global _configure ../%{sources}/configure +%global _configure ../configure + +# Github forge +%global gh_vend php +%global gh_proj pecl-search_engine-solr +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag %{version} # For full test (using localhost server) use --with fulltests # retrieve: podman pull docker.io/omars/solr53 @@ -28,21 +33,18 @@ %bcond_without tests %bcond_with fulltests -Summary: Object oriented API to Apache Solr -Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr2 -Version: 2.9.1 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Summary: Object oriented API to Apache Solr 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 +Version: 2.9.3 +Release: 1%{?dist} +%forgemeta +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc 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 BuildRequires: curl-devel @@ -91,14 +93,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep -%setup -c -q - -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - -e '/LICENSE/s/role="doc"/role="src"/' \ - -i package.xml +%forgesetup -cd %{sources} : 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 @@ -106,8 +102,6 @@ if test "x${extver}" != "x%{version}%{?prever}"; then exit 1 fi -cd .. - # Create configuration file cat > %{ini_name} << 'EOF' ; Enable Solr extension module @@ -123,14 +117,14 @@ mkdir ZTS %build %{?dtsenable} -cd %{sources} %{__phpize} sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global -cd ../NTS +cd NTS %configure \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} + %make_build %if %{with_zts} @@ -138,6 +132,7 @@ cd ../ZTS %configure \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} + %make_build %endif @@ -147,9 +142,6 @@ cd ../ZTS %make_install -C NTS -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -159,14 +151,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Documentation -for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - %check -cd %{sources} %if %{with fulltests} export SOLR_SERVER_CONFIGURED=1 %else @@ -185,9 +170,7 @@ OPT="-n" %if %{with tests} : Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php -q --show-diff %endif @@ -200,9 +183,11 @@ REPORT_EXIT_STATUS=1 \ %files -%license %{sources}/LICENSE -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml +%license LICENSE +%doc composer.json +%doc README.* +%doc docs +%doc examples %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -214,6 +199,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Apr 14 2026 Remi Collet <remi@remirepo.net> - 2.9.3-1 +- update to 2.9.3 +- drop pear/pecl dependency +- sources from github + * Tue Nov 25 2025 Remi Collet <remi@remirepo.net> - 2.9.1-1 - update to 2.9.1 - drop patch merged upstream |